diff --git a/clients/kstep/nextclient.cpp b/clients/kstep/nextclient.cpp
index 0eafbd3e70..18a4fae349 100644
--- a/clients/kstep/nextclient.cpp
+++ b/clients/kstep/nextclient.cpp
@@ -324,7 +324,7 @@ void NextClient::paintEvent( QPaintEvent* )
 void NextClient::mouseDoubleClickEvent( QMouseEvent * e )
 {
     if (titlebar->geometry().contains( e->pos() ) )
-        setShade( !isShade() );
+	workspace()->performWindowOperation( this, options->operationTitlebarDblClick() );
     workspace()->requestFocus( this );
 }
 
diff --git a/clients/laptop/laptopclient.cpp b/clients/laptop/laptopclient.cpp
index 253d71055d..8d8502cc42 100644
--- a/clients/laptop/laptopclient.cpp
+++ b/clients/laptop/laptopclient.cpp
@@ -499,7 +499,7 @@ void LaptopClient::windowWrapperShowEvent( QShowEvent* )
 void LaptopClient::mouseDoubleClickEvent( QMouseEvent * e )
 {
     if (titlebar->geometry().contains( e->pos() ) )
-        setShade( !isShade() );
+	workspace()->performWindowOperation( this, options->operationTitlebarDblClick() );
     workspace()->requestFocus( this );
 }
 
diff --git a/clients/modernsystem/modernsys.cpp b/clients/modernsystem/modernsys.cpp
index ef0b1d4cea..37cc07f3cc 100644
--- a/clients/modernsystem/modernsys.cpp
+++ b/clients/modernsystem/modernsys.cpp
@@ -474,7 +474,7 @@ void ModernSys::windowWrapperShowEvent( QShowEvent* )
 void ModernSys::mouseDoubleClickEvent( QMouseEvent * e )
 {
     if (titlebar->geometry().contains( e->pos() ) )
-        setShade( !isShade() );
+	workspace()->performWindowOperation( this, options->operationTitlebarDblClick() );
     workspace()->requestFocus( this );
 }
 
diff --git a/clients/riscos/Manager.cpp b/clients/riscos/Manager.cpp
index d00c7d654a..42a130f8a8 100644
--- a/clients/riscos/Manager.cpp
+++ b/clients/riscos/Manager.cpp
@@ -193,6 +193,13 @@ Manager::fakeMouseEvent(QMouseEvent * e, QWidget * w)
   Client::event(&fake);
 }
 
+  void 
+Manager::mouseDoubleClickEvent( QMouseEvent * )
+{
+    workspace()->performWindowOperation( this, options->operationTitlebarDblClick() );
+    workspace()->requestFocus( this );
+}
+
 } // End namespace
 
 // vim:ts=2:sw=2:tw=78
diff --git a/clients/riscos/Manager.h b/clients/riscos/Manager.h
index 65adad068f..715f58e8d2 100644
--- a/clients/riscos/Manager.h
+++ b/clients/riscos/Manager.h
@@ -43,7 +43,7 @@ class Manager : public Client
     void setShade(bool);
 
     void fakeMouseEvent(QMouseEvent *, QWidget *);
-
+    
   signals:
 
     void maximiseChanged(bool);
@@ -63,6 +63,7 @@ class Manager : public Client
     void paintEvent(QPaintEvent *);
     void resizeEvent(QResizeEvent *);
     void activateLayout();
+    void mouseDoubleClickEvent( QMouseEvent * );
     
   protected slots:
 
diff --git a/clients/system/systemclient.cpp b/clients/system/systemclient.cpp
index c41c134b11..160cadff91 100644
--- a/clients/system/systemclient.cpp
+++ b/clients/system/systemclient.cpp
@@ -467,7 +467,7 @@ void SystemClient::windowWrapperShowEvent( QShowEvent* )
 void SystemClient::mouseDoubleClickEvent( QMouseEvent * e )
 {
     if (titlebar->geometry().contains( e->pos() ) )
-        setShade( !isShade() );
+	workspace()->performWindowOperation( this, options->operationTitlebarDblClick() );
     workspace()->requestFocus( this );
 }