diff --git a/src/mi2u/ui/MapInfoTable.java b/src/mi2u/ui/MapInfoTable.java
index b59d34c..0b40811 100644
--- a/src/mi2u/ui/MapInfoTable.java
+++ b/src/mi2u/ui/MapInfoTable.java
@@ -85,6 +85,9 @@ public MapInfoTable(){
 
         //wave tools
         wavesPopup.addInGameVisible();
+        wavesPopup.update(() -> {
+            wavesPopup.keepInScreen();
+        });
         wavesPopup.addCloseButton();
         wavesPopup.addDragMove();
         wavesPopup.background(Styles.black3);