diff --git a/selfdrive/ui/qt/maps/map_settings.cc b/selfdrive/ui/qt/maps/map_settings.cc
index 3b573a0d3b..edcc17d810 100644
--- a/selfdrive/ui/qt/maps/map_settings.cc
+++ b/selfdrive/ui/qt/maps/map_settings.cc
@@ -118,6 +118,11 @@ MapSettings::MapSettings(bool closeable, QWidget *parent)
   }
 }
 
+void MapSettings::mousePressEvent(QMouseEvent *ev) {
+  // Prevent mouse event from propagating up
+  ev->accept();
+}
+
 void MapSettings::showEvent(QShowEvent *event) {
   updateCurrentRoute();
 }
diff --git a/selfdrive/ui/qt/maps/map_settings.h b/selfdrive/ui/qt/maps/map_settings.h
index 39fbe740f4..43ebb09b69 100644
--- a/selfdrive/ui/qt/maps/map_settings.h
+++ b/selfdrive/ui/qt/maps/map_settings.h
@@ -33,6 +33,7 @@ public:
   void updateCurrentRoute();
 
 private:
+  void mousePressEvent(QMouseEvent *ev) override;
   void showEvent(QShowEvent *event) override;
   void refresh();
 
diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc
index 35fff4e0e6..a3e13c02a1 100644
--- a/selfdrive/ui/qt/onroad.cc
+++ b/selfdrive/ui/qt/onroad.cc
@@ -75,9 +75,6 @@ void OnroadWindow::mousePressEvent(QMouseEvent* e) {
 #ifdef ENABLE_MAPS
   if (map != nullptr) {
     bool sidebarVisible = geometry().x() > 0;
-    if (map->isVisible() && !((MapPanel *)map)->isShowingMap() && e->windowPos().x() >= 1080) {
-      return;
-    }
     map->setVisible(!sidebarVisible && !map->isVisible());
   }
 #endif