diff --git a/radio/src/gui/colorlcd/draw_functions.cpp b/radio/src/gui/colorlcd/draw_functions.cpp
index 70355d4e1..687aeab62 100644
--- a/radio/src/gui/colorlcd/draw_functions.cpp
+++ b/radio/src/gui/colorlcd/draw_functions.cpp
@@ -317,17 +317,16 @@ coord_t drawGPSCoord(BitmapBuffer * dc, coord_t x, coord_t y, int32_t value, con
   }
   *tmp++ = direction[value>=0 ? 0 : 1];
   *tmp = '\0';
-  x += dc->drawText(x, y, s, flags);
+  x = dc->drawText(x, y, s, flags);
   return x;
 }
 
 void drawGPSPosition(BitmapBuffer * dc, coord_t x, coord_t y, int32_t longitude, int32_t latitude, LcdFlags flags)
 {
-  if (flags & EXPANDED) {
-    drawGPSCoord(dc, x, y, latitude, "NS", flags, true);
-    drawGPSCoord(dc, x, y + FH, longitude, "EW", flags, true);
-  }
-  else {
+  if (flags & RIGHT) {
+    x = drawGPSCoord(dc, x, y, longitude, "EW", flags, false);
+    drawGPSCoord(dc, x - 5, y, latitude, "NS", flags, false);
+  } else {
     x = drawGPSCoord(dc, x, y, latitude, "NS", flags, false);
     drawGPSCoord(dc, x + 5, y, longitude, "EW", flags, false);
   }
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index d1c94e627..bca0e093b 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit d1c94e6279e7b829f4b0953bc4bea1100bae5543
+Subproject commit bca0e093b001596d27cc8297a3ec142a3b42239b