diff --git a/workspace.cpp b/workspace.cpp
index 8332704f6e..40a11e6776 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1411,7 +1411,7 @@ void Workspace::setActiveClient( Client* c )
 {
     if ( active_client == c )
         return;
-    if( popup && static_cast< Client* >( popup_client ) != c ) {
+    if( popup && popup_client != c ) {
         popup->close();
         popup_client = 0;
     }
@@ -1781,7 +1781,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
 
 void Workspace::clientPopupActivated( int id )
 {
-    performWindowOperation( popup_client ? static_cast< Client* >( popup_client ) : active_client, (Options::WindowOperation) id );
+    performWindowOperation( popup_client ? popup_client : active_client, (Options::WindowOperation) id );
 }
 
 /*!
diff --git a/workspace.h b/workspace.h
index 25b0ee569e..a8ab00a92a 100644
--- a/workspace.h
+++ b/workspace.h
@@ -395,7 +395,7 @@ private:
     int number_of_desktops;
     QMemArray<int> desktop_focus_chain;
 
-    QGuardedPtr<Client> popup_client;
+    Client* popup_client;
 
     void loadSessionInfo();