diff --git a/Opus/Code/MainActivity.cs b/Opus/Code/MainActivity.cs
index de0eb48..2cfa4ab 100644
--- a/Opus/Code/MainActivity.cs
+++ b/Opus/Code/MainActivity.cs
@@ -438,7 +438,6 @@ namespace Opus
         public void Navigate(int layout)
         {
             contentRefresh.Refreshing = false;
-
             if (YoutubeSearch.instances != null)
             {
                 var searchView = menu.FindItem(Resource.Id.search).ActionView.JavaCast<SearchView>();
@@ -451,6 +450,8 @@ namespace Opus
                 SupportFragmentManager.PopBackStack(null, Android.Support.V4.App.FragmentManager.PopBackStackInclusive);
             }
 
+            FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
+
             if (PlaylistTracks.instance != null)
             {
                 SupportFragmentManager.BeginTransaction().Remove(PlaylistTracks.instance).Commit();
diff --git a/Opus/Code/UI/Fragments/ChannelDetails.cs b/Opus/Code/UI/Fragments/ChannelDetails.cs
index b4fa444..b7e525a 100644
--- a/Opus/Code/UI/Fragments/ChannelDetails.cs
+++ b/Opus/Code/UI/Fragments/ChannelDetails.cs
@@ -85,30 +85,13 @@ namespace Opus.Fragments
                 MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(false);
                 MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false);
                 MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false);
-                MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
+                if (MainActivity.instance.FindViewById(Resource.Id.toolbarLogo) != null)
+                    MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
 
                 MainActivity.instance.contentRefresh.Refresh -= OnRefresh;
                 Activity.FindViewById<AppBarLayout>(Resource.Id.appbar).RemoveOnOffsetChangedListener(this);
-
-
-                if (YoutubeSearch.instances != null)
-                {
-                    MainActivity.instance.FindViewById<TabLayout>(Resource.Id.tabs).Visibility = ViewStates.Visible;
-                    SearchView searchView = (SearchView)MainActivity.instance.menu.FindItem(Resource.Id.search).ActionView;
-                    searchView.Focusable = false;
-                    MainActivity.instance.menu.FindItem(Resource.Id.search).ExpandActionView();
-                    searchView.SetQuery(YoutubeSearch.instances[0].Query, false);
-                    searchView.ClearFocus();
-
-                    int selectedTab = 0;
-                    for (int i = 0; i < YoutubeSearch.instances.Length; i++)
-                    {
-                        if (YoutubeSearch.instances[i].IsFocused)
-                            selectedTab = i;
-                    }
-                }
-                instance = null;
             }
+            instance = null;
             base.OnDestroyView();
         }
 
diff --git a/Opus/Code/UI/Fragments/FolderTracks.cs b/Opus/Code/UI/Fragments/FolderTracks.cs
index 1d9f07e..f17591b 100644
--- a/Opus/Code/UI/Fragments/FolderTracks.cs
+++ b/Opus/Code/UI/Fragments/FolderTracks.cs
@@ -43,7 +43,6 @@ namespace Opus.Fragments
 
         public override void OnDestroy()
         {
-            MainActivity.instance.RemoveFilterListener(Search);
             MainActivity.instance.contentRefresh.Refresh -= OnRefresh;
             instance = null;
             base.OnDestroy();
@@ -153,7 +152,9 @@ namespace Opus.Fragments
             MainActivity.instance.SupportActionBar.SetHomeButtonEnabled(false);
             MainActivity.instance.SupportActionBar.SetDisplayHomeAsUpEnabled(false);
             MainActivity.instance.SupportActionBar.SetDisplayShowTitleEnabled(false);
-            MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
+            if (MainActivity.instance.FindViewById(Resource.Id.toolbarLogo) != null)
+                MainActivity.instance.FindViewById(Resource.Id.toolbarLogo).Visibility = ViewStates.Visible;
+            MainActivity.instance.RemoveFilterListener(Search);
             MainActivity.instance.HideFilter();
             base.OnDestroyView();
         }