diff --git a/src/main.cpp b/src/main.cpp
index 16aa20998..cfbd7e484 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -335,7 +335,7 @@ void loop()
     screen.debug()->setChannelNameStatus(channelSettings.name);
     screen.debug()->setPowerStatus(powerStatus);
     // TODO(#4): use something based on hdop to show GPS "signal" strength.
-    screen.debug()->setGPSStatus(gps->hasLock() ? "good" : "bad");
+    screen.debug()->setGPSStatus(gps->isConnected ? (gps->hasLock() ? "GPS ok" : "No Sats") : "No GPS");
 
     // No GPS lock yet, let the OS put the main CPU in low power mode for 100ms (or until another interrupt comes in)
     // i.e. don't just keep spinning in loop as fast as we can.
diff --git a/src/screen.cpp b/src/screen.cpp
index 9198bc202..1837ef797 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -667,7 +667,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
         }
 
         if (!gpsStatus.empty()) {
-            snprintf(gpsStr, sizeof(gpsStr), "GPS %s", gpsStatus.c_str());
+            snprintf(gpsStr, sizeof(gpsStr), "%s", gpsStatus.c_str());
         } else {
             gpsStr[0] = '\0'; // Just show empty string.
         }