diff --git a/src/modules/WaypointModule.cpp b/src/modules/WaypointModule.cpp
index 628d7f62c..8194c3d01 100644
--- a/src/modules/WaypointModule.cpp
+++ b/src/modules/WaypointModule.cpp
@@ -170,17 +170,17 @@ void WaypointModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state,
         else
             strncpy(distStr, "? km", sizeof(distStr));
     }
-
+    
+    // Draw compass circle
+    display->drawCircle(compassX, compassY, compassDiam / 2);
+    
     // Undo color-inversion, if set prior to drawing header
     // Unsure of expected behavior? For now: copy drawNodeInfo
     if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_INVERTED) {
         display->setColor(BLACK);
     }
-
-    // Draw compass circle
-    display->drawCircle(compassX, compassY, compassDiam / 2);
-
+    
     // Must be after distStr is populated
     screen->drawColumns(display, x, y, fields);
 }
-#endif
\ No newline at end of file
+#endif