diff --git a/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt
index 78f4bf1ff5..11dfe7ead2 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/WorldScreen.kt
@@ -634,7 +634,14 @@ class WorldScreen(
 
         updateMultiplayerStatusButton()
 
+        statusButtons.wrap(false)
         statusButtons.pack()
+        val maxWidth = stage.width - techPolicyAndDiplomacy.width - 25f
+        if(statusButtons.width > maxWidth) {
+            statusButtons.width = maxWidth
+            statusButtons.wrap()
+            statusButtons.pack()
+        }
         statusButtons.setPosition(stage.width - statusButtons.width - 10f, topBar.y - statusButtons.height - 10f)
     }
 
diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt b/core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt
index de19ae2616..9a89e5d374 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/status/StatusButtons.kt
@@ -19,6 +19,9 @@ class StatusButtons(
     init {
         space(10f)
         right()
+        wrapReverse()
+        wrapSpace(10f)
+        rowRight()
         if (multiplayerStatusButton != null) {
             addActor(multiplayerStatusButton)
         }