diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 067e4418f..ed8119738 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1373,6 +1373,8 @@ int Screen::handleInputEvent(const InputEvent *event)
                            this->ui->getUiState()->currentFrame == framesetInfo.positions.nodelist_hopsignal ||
                            this->ui->getUiState()->currentFrame == framesetInfo.positions.nodelist_bearings) {
                     menuHandler::nodeListMenu();
+                } else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.wifi) {
+                    menuHandler::wifiBaseMenu();
                 }
             } else if (event->inputEvent == INPUT_BROKER_BACK) {
                 showPrevFrame();
diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp
index 7e5063fef..43c226896 100644
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -831,6 +831,44 @@ void menuHandler::numberTest()
                              [](int number_picked) -> void { LOG_WARN("Nodenum: %u", number_picked); });
 }
 
+void menuHandler::wifiBaseMenu()
+{
+    enum optionsNumbers { Back, Wifi_toggle };
+
+    static const char *optionsArray[] = {"Back", "WiFi Toggle"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "WiFi Menu";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Wifi_toggle) {
+            menuQueue = wifi_toggle_menu;
+            screen->runNow();
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
+void menuHandler::wifiToggleMenu()
+{
+    enum optionsNumbers { Back, Wifi_toggle };
+
+    static const char *optionsArray[] = {"Back", "Disable"};
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Disable Wifi and\nEnable Bluetooth?";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 2;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Wifi_toggle) {
+            config.network.wifi_enabled = false;
+            config.bluetooth.enabled = true;
+            service->reloadConfig(SEGMENT_CONFIG);
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
+        }
+    };
+    screen->showOverlayBanner(bannerOptions);
+}
+
 void menuHandler::handleMenuSwitch(OLEDDisplay *display)
 {
     if (menuQueue != menu_none)
@@ -894,6 +932,9 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
     case number_test:
         numberTest();
         break;
+    case wifi_toggle_menu:
+        wifiToggleMenu();
+        break;
     }
     menuQueue = menu_none;
 }
diff --git a/src/graphics/draw/MenuHandler.h b/src/graphics/draw/MenuHandler.h
index 09279b041..8824e38ed 100644
--- a/src/graphics/draw/MenuHandler.h
+++ b/src/graphics/draw/MenuHandler.h
@@ -13,9 +13,7 @@ class menuHandler
         clock_face_picker,
         clock_menu,
         position_base_menu,
-#if !MESHTASTIC_EXCLUDE_GPS
         gps_toggle_menu,
-#endif
         compass_point_north_menu,
         reset_node_db_menu,
         buzzermodemenupicker,
@@ -26,7 +24,8 @@ class menuHandler
         add_favorite,
         remove_favorite,
         test_menu,
-        number_test
+        number_test,
+        wifi_toggle_menu
     };
     static screenMenus menuQueue;
 
@@ -54,6 +53,8 @@ class menuHandler
     static void removeFavoriteMenu();
     static void testMenu();
     static void numberTest();
+    static void wifiBaseMenu();
+    static void wifiToggleMenu();
 };
 
 } // namespace graphics
\ No newline at end of file