diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt
index 28aea8e6c..b1877b8c3 100644
--- a/app/src/main/java/com/aurora/store/MainActivity.kt
+++ b/app/src/main/java/com/aurora/store/MainActivity.kt
@@ -171,6 +171,24 @@ class MainActivity : BaseActivity() {
             Constants.NAVIGATION_UPDATES -> B.navView.selectedItemId = R.id.navigation_updates
             else -> Log.i("Unhandled intent action: ${intent.action}")
         }
+
+        // Handle views on fragments
+        navController.addOnDestinationChangedListener { _, navDestination, _ ->
+            when (navDestination.id) {
+                R.id.navigation_apps,
+                R.id.navigation_games,
+                R.id.navigation_updates -> {
+                    B.searchFab.visibility = View.VISIBLE
+                    B.navView.visibility = View.VISIBLE
+                    B.viewToolbar.root.visibility = View.VISIBLE
+                }
+                else -> {
+                    B.searchFab.visibility = View.GONE
+                    B.navView.visibility = View.GONE
+                    B.viewToolbar.root.visibility = View.GONE
+                }
+            }
+        }
     }
 
     private fun attachToolbar() {