diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js
index ddd0bd9c46..6a76207fea 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.panel.js
@@ -295,11 +295,20 @@ Sonia.History.register('repositoryPanel', {
     if ( ! panel ){
       main.addRepositoriesTabPanel();
       panel = Ext.getCmp('repositories');
+      if ( repoId ){
+        var selected = false;
+        panel.getGrid().getStore().addListener('load', function(){
+          if (!selected){
+            panel.getGrid().selectedById(repoId);
+            selected = true;
+          }
+        });
+      }
     } else {
       main.addTab(panel);
-    }
-    if (repoId){
-      panel.getGrid().selectById(repoId);
+      if (repoId){
+        panel.getGrid().selectById(repoId);
+      }
     }
   }
 });
\ No newline at end of file