diff --git a/src/gps/GPS.h b/src/gps/GPS.h
index a8a82a033..5d24268d7 100644
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -131,6 +131,7 @@ class GPS : private concurrency::OSThread
 
     void setNumSatellites(uint8_t n);
 
+  private:
     /// Prepare the GPS for the cpu entering deep or light sleep, expect to be gone for at least 100s of msecs
     /// always returns 0 to indicate okay to sleep
     int prepareSleep(void *unused);
@@ -138,7 +139,6 @@ class GPS : private concurrency::OSThread
     /// Prepare the GPS for the cpu entering deep sleep, expect to be gone for at least 100s of msecs
     /// always returns 0 to indicate okay to sleep
     int prepareDeepSleep(void *unused);
-  private:
 
     /**
      * Switch the GPS into a mode where we are actively looking for a lock, or alternatively switch GPS into a low power mode
diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index eac78dd64..81ed10444 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -506,6 +506,22 @@ static void drawGPS(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus
     }
 }
 
+//Draw status when gps is disabled by PMU
+static void drawGPSpowerstat(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps){
+String displayLine = "";
+displayLine = "GPS disabled";
+int16_t xPos = display->getStringWidth(displayLine);
+    #ifdef HAS_PMU
+    if (!config.position.gps_enabled){
+            display->drawString(x + xPos, y, displayLine);
+        #ifdef GPS_POWER_TOGGLE 
+            display->drawString(x + xPos, y - 2 + FONT_HEIGHT_SMALL, " by button");
+        #endif
+        //display->drawString(x + xPos, y + 2, displayLine);
+    }
+    #endif
+}
+
 static void drawGPSAltitude(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus *gps)
 {
     String displayLine = "";
@@ -1372,7 +1388,15 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     // Display nodes status
     drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 2, nodeStatus);
     // Display GPS status
+    if (!config.position.gps_enabled){
+    int16_t yPos = y + 2;
+        #ifdef GPS_POWER_TOGGLE
+        yPos = (y + 10 + FONT_HEIGHT_SMALL);
+        #endif
+    drawGPSpowerstat(display, x, yPos, gpsStatus);
+    } else {
     drawGPS(display, x + (SCREEN_WIDTH * 0.63), y + 2, gpsStatus);
+    }
 
     // Draw the channel name
     display->drawString(x, y + FONT_HEIGHT_SMALL, channelStr);
@@ -1613,7 +1637,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     char chUtil[13];
     sprintf(chUtil, "ChUtil %2.0f%%", airTime->channelUtilizationPercent());
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(chUtil), y + FONT_HEIGHT_SMALL * 1, chUtil);
-
+if (config.position.gps_enabled) {
     // Line 3
     if (config.display.gps_format !=
         Config_DisplayConfig_GpsCoordinateFormat_DMS) // if DMS then don't draw altitude
@@ -1621,7 +1645,9 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
 
     // Line 4
     drawGPScoordinates(display, x, y + FONT_HEIGHT_SMALL * 3, gpsStatus);
-
+} else {
+    drawGPSpowerstat(display, x - (SCREEN_WIDTH / 4), y + FONT_HEIGHT_SMALL * 2, gpsStatus);
+}
     /* Display a heartbeat pixel that blinks every time the frame is redrawn */
 #ifdef SHOW_REDRAWS
     if (heartbeat)