diff --git a/sysui/Home/MapWidget.qml b/sysui/Home/MapWidget.qml
index fb81e18..9a419a3 100644
--- a/sysui/Home/MapWidget.qml
+++ b/sysui/Home/MapWidget.qml
@@ -67,6 +67,7 @@ UIPanel {
             ApplicationManagerInterface.mapWidget.width = Qt.binding(function () { return loader.width})
             ApplicationManagerInterface.mapWidget.height = loader.height
             loader.children = ApplicationManagerInterface.mapWidget
+            ApplicationManagerInterface.mapWidget.visible = Qt.binding(function () { return root.visible})
         }
     }
 }
diff --git a/sysui/MenuScreen.qml b/sysui/MenuScreen.qml
index aef4380..9abcb3e 100644
--- a/sysui/MenuScreen.qml
+++ b/sysui/MenuScreen.qml
@@ -60,24 +60,44 @@ PageSwipeScreen {
         MyCarPage {
             width: root.itemWidth
             height: root.height
+            visible: root.currentIndex === ObjectModel.index ||
+                     root.moving &&
+                     (root.currentIndex + 1  === ObjectModel.index ||
+                      root.currentIndex - 1  === ObjectModel.index)
         }
         FunctionsPage {
             width: root.itemWidth
             height: root.height
+            visible: root.currentIndex === ObjectModel.index ||
+                     root.moving &&
+                     (root.currentIndex + 1  === ObjectModel.index ||
+                      root.currentIndex - 1  === ObjectModel.index)
         }
         HomePage {
             width: root.itemWidth
             height: root.height
+            visible: root.currentIndex === ObjectModel.index ||
+                     root.moving &&
+                     (root.currentIndex + 1  === ObjectModel.index ||
+                      root.currentIndex - 1  === ObjectModel.index)
         }
         LauncherPage {
             id: launcher
             width: root.itemWidth
             height: root.height
             onUpdateApp: currentIndex = 3
+            visible: root.currentIndex === ObjectModel.index ||
+                     root.moving &&
+                     (root.currentIndex + 1  === ObjectModel.index ||
+                      root.currentIndex - 1  === ObjectModel.index)
         }
         CloudPage {
             width: root.itemWidth
             height: root.height
+            visible: root.currentIndex === ObjectModel.index ||
+                     root.moving &&
+                     (root.currentIndex + 1  === ObjectModel.index ||
+                      root.currentIndex - 1  === ObjectModel.index)
         }
     }
 }