diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js
index 4362ea721b..19f8fc311d 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.grid.js
@@ -482,8 +482,34 @@ Sonia.repository.Grid = Ext.extend(Sonia.rest.Grid, {
         listener.call(listener.scope, item, panels);
       }
     });
+  
+    // get the xtype of the currently opened tab
+    // search for the tab with the same xtype and activate it
+    // see issue https://goo.gl/3RGnA3
+    var activeTab = 0;
+    var activeXtype = this.getActiveTabXtype();
+    if (activeXtype){
+      for (var i=0; i<panels.length; i++){
+        if (panels[i].xtype === activeXtype){
+          activeTab = i;
+          break;
+        }
+      }
+    }
 
-    Sonia.repository.setEditPanel(panels);
+    Sonia.repository.setEditPanel(panels, activeTab);
+  },
+  
+  getActiveTabXtype: function(){
+    var type = null;
+    var rep = Ext.getCmp('repositoryEditPanel');
+    if (rep){
+      var at = rep.getActiveTab();
+      if (at && at.xtype){
+        type = at.xtype;
+      }
+    }
+    return type;
   },
 
   renderRepositoryType: function(repositoryType){
diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.js
index 237b0df38f..7e10a58f4e 100644
--- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.js
+++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.js
@@ -74,13 +74,18 @@ Sonia.repository.isOwner = function(repository){
   return admin || repository.permissions;
 };
 
-Sonia.repository.setEditPanel = function(panels){
+Sonia.repository.setEditPanel = function(panels, activeTab){
   var editPanel = Ext.getCmp('repositoryEditPanel');
   editPanel.removeAll();
   Ext.each(panels, function(panel){
     editPanel.add(panel);
   });
-  editPanel.setActiveTab(0);
+  
+  if (!activeTab){
+    activeTab = 0;
+  }
+  
+  editPanel.setActiveTab(activeTab);
   editPanel.doLayout();
 };