diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 69c0b0c06a1a..f65145775121 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -343,6 +343,14 @@ void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry )
         aBtnPos.Move( 20, 0 );
         m_aDeauthoriseButton.SetPosPixel( aBtnPos );
         m_aDeauthoriseButton.Show( bAlreadyAuthorised );
+        if ( bAlreadyAuthorised )
+        {
+            m_aDeauthoriseButton.GetFocus();
+        }
+        else
+        {
+            m_aPinBox.GetFocus();
+        }
     }
     else
     {