diff --git a/radio/src/gui/colorlcd/screen_setup.cpp b/radio/src/gui/colorlcd/screen_setup.cpp
index 856eaffa0..693e3628e 100644
--- a/radio/src/gui/colorlcd/screen_setup.cpp
+++ b/radio/src/gui/colorlcd/screen_setup.cpp
@@ -206,11 +206,19 @@ class SetupWidgetsPage: public FormWindow
     }
 
 #if defined(HARDWARE_TOUCH)
-    bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY, coord_t slideX, coord_t slideY) override
+    bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY,
+                      coord_t slideX, coord_t slideY) override
     {
       // prevent screen sliding when setting up widgets
       return true;
     }
+
+    bool onTouchEnd(coord_t x, coord_t y) override
+    {
+      if (FormWindow::onTouchEnd(x, y)) return true;
+
+      return true;
+    }
 #endif
 
 #if defined(HARDWARE_KEYS)
diff --git a/radio/src/gui/colorlcd/topbar.cpp b/radio/src/gui/colorlcd/topbar.cpp
index 172f4f9cf..5c935ec9b 100644
--- a/radio/src/gui/colorlcd/topbar.cpp
+++ b/radio/src/gui/colorlcd/topbar.cpp
@@ -83,3 +83,19 @@ void SetupTopBarWidgetsPage::onEvent(event_t event)
 }
 #endif
 
+#if defined(HARDWARE_TOUCH)
+bool SetupTopBarWidgetsPage::onTouchSlide(coord_t x, coord_t y,
+                                          coord_t startX, coord_t startY,
+                                          coord_t slideX, coord_t slideY)
+{
+  return true;
+}
+
+bool SetupTopBarWidgetsPage::onTouchEnd(coord_t x, coord_t y)
+{
+  if (FormWindow::onTouchEnd(x, y))
+    return true;
+
+  return true;
+}
+#endif
diff --git a/radio/src/gui/colorlcd/topbar.h b/radio/src/gui/colorlcd/topbar.h
index d7b519b43..b20d2520f 100644
--- a/radio/src/gui/colorlcd/topbar.h
+++ b/radio/src/gui/colorlcd/topbar.h
@@ -59,6 +59,12 @@ class SetupTopBarWidgetsPage: public FormWindow
     void onEvent(event_t event) override;
 #endif
 
+#if defined(HARDWARE_TOUCH)
+    bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY,
+                      coord_t slideX, coord_t slideY) override;
+    bool onTouchEnd(coord_t x, coord_t y) override;
+#endif
+
   protected:
     ScreenMenu* menu;
     unsigned savedView = 0;