diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index 404c5d4f08..a981d907f9 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -1445,7 +1445,11 @@ namespace Oxygen
 
     } else if( buttonToWindowOperation( mouseButton_ ) == OperationsOp ) {
 
-      accepted = true;
+      QPoint point = event->pos();
+      int itemClicked( OxygenClient::itemClicked( point ) );
+      displayClientMenu( itemClicked, widget()->mapToGlobal( event->pos() ) );
+      mouseButton_ = Qt::NoButton;
+      accepted = true; // displayClientMenu can possibly destroy the deco...
 
     }
     return accepted;
@@ -1471,14 +1475,6 @@ namespace Oxygen
         accepted = true;
       }
 
-    } else if( mouseButton_ == event->button() &&
-        buttonToWindowOperation( mouseButton_ ) == OperationsOp ) {
-
-      QPoint point = event->pos();
-      int itemClicked( OxygenClient::itemClicked( point ) );
-      displayClientMenu( itemClicked, widget()->mapToGlobal( event->pos() ) );
-      accepted = true; // displayClientMenu can possibly destroy the deco...
-
     }
 
     mouseButton_ = Qt::NoButton;