diff --git a/src/window.cpp b/src/window.cpp
index e8a6b8802b..a4f215af0d 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -689,6 +689,8 @@ static Window *LocalAllocateWindow(
 		w->wndproc(w, &e);
 	}
 
+	if (w->left + w->width > _screen.width) w->left -= (w->left + w->width - _screen.width);
+
 	const Window *wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
 	w->top  = max(w->top, (wt == NULL || w == wt || y == 0) ? 0 : wt->height);
 	w->left = max(w->left, 0);