diff --git a/src/Window.cc b/src/Window.cc
index c5d3db39..3a982115 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3179,7 +3179,13 @@ void BlackboxWindow::buttonPressEvent(const XButtonEvent *be) {
         my = top_edge;
       else if (my > bottom_edge)
         my = bottom_edge;
+      
+      if (my + windowmenu->getHeight() > screen->getHeight())
+        my = screen->getHeight() - windowmenu->getHeight() -
+          (screen->getBorderWidth() * 2);
 
+
+      cout << my << endl;
       windowmenu->move(mx, my);
       windowmenu->show();
       XRaiseWindow(blackbox->getXDisplay(), windowmenu->getWindowID());