diff --git a/client.cpp b/client.cpp
index bd30ac5913..7c72c67cef 100644
--- a/client.cpp
+++ b/client.cpp
@@ -758,7 +758,7 @@ void Client::mousePressEvent( QMouseEvent * e)
 	moveOffset = e->pos();
 	invertedMoveOffset = rect().bottomRight() - e->pos();
     }
-    else if ( e->button() == RightButton ) {
+    else if ( !buttonDown && e->button() == RightButton ) {
 	workspace()->clientPopup( this ) ->popup( e->globalPos() );
     }
 }