diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index dd7298bf61e0..f10e9439ef0b 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -279,7 +279,15 @@ namespace svt
         if ( bActivatePanel )
         {
             const size_t nPanelPos = impl_getPanelPositionFromWindow( pWindowEvent->GetWindow() );
-            m_rPanelDeck.ActivatePanel( nPanelPos );
+            if ( nPanelPos != m_rPanelDeck.GetActivePanel() )
+            {
+                m_rPanelDeck.ActivatePanel( nPanelPos );
+            }
+            else
+            {
+                PToolPanel pPanel( m_rPanelDeck.GetPanel( nPanelPos ) );
+                pPanel->GrabFocus();
+            }
             return 1L;
         }
         return 0L;