diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 83cd52c98cf6..d7b32f465dfe 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -1142,6 +1142,9 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, OkHdl, Button*, void )
             OpenURL( sPathNoExt );
             m_pName_ed->SetText( "" );
 
+            if( !bSelected )
+                m_pName_ed->GrabFocus();
+
             return;
         }