diff --git a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.grid.js b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.grid.js
index 9def9bd28c..6ca5822949 100644
--- a/scm-webapp/src/main/webapp/resources/js/group/sonia.group.grid.js
+++ b/scm-webapp/src/main/webapp/resources/js/group/sonia.group.grid.js
@@ -116,11 +116,7 @@ Sonia.group.Grid = Ext.extend(Sonia.rest.Grid, {
       console.debug( group.name + ' selected' );
     }
     
-    var token = Ext.History.getToken();
-    if ( token ){
-      var parts = token.split('|');
-      Ext.History.add(parts[0] + '|' + group.name);
-    }
+    Sonia.History.append(group.name);
 
     Ext.getCmp('groupRmButton').setDisabled(false);
     Sonia.group.setEditPanel([{
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 bc6c23b9b7..185f0e8012 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
@@ -103,11 +103,7 @@ Sonia.repository.Grid = Ext.extend(Sonia.rest.Grid, {
       console.debug( item.name + ' selected' );
     }
     
-    var token = Ext.History.getToken();
-    if ( token ){
-      var parts = token.split('|');
-      Ext.History.add(parts[0] + '|' + item.name);
-    }
+    Sonia.History.append(item.name);
 
     var infoPanel = main.getInfoPanel(item.type);
     infoPanel.item = item;
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.history.js b/scm-webapp/src/main/webapp/resources/js/sonia.history.js
index 3a11dd6250..b1d6eae314 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.history.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.history.js
@@ -29,14 +29,64 @@
  * 
  */
 
+Ext.ns('Sonia');
+
+Sonia.History = {
+ 
+  historyElements: [],
+  recentlyAdded: [],
+  
+  add: function(token){
+    this.recentlyAdded.push(token);
+    Ext.History.add(token, true);
+  },
+  
+  append: function(item){
+    var token = Ext.History.getToken();
+    if ( token ){
+      var parts = token.split('|');
+      this.add(parts[0] + '|' + item);
+    }
+  },
+  
+  register: function(id, fn){
+    this.historyElements.push({
+      'id': id,
+      'fn': fn
+    });
+  },
+  
+  handleChange: function(id, params){
+    if ( debug ){
+      console.debug( 'handle ' + id + ' with "' + params + '"' );
+    }
+    for (var i=0; i<this.historyElements.length; i++){
+      if (this.historyElements.id == id){
+        el.fn(params);
+      }
+    }
+  }
+
+};
+
 
 Ext.History.on('change', function(token){
   if(token){
-    var parts = token.split('|');
-    var tab = parts[0];
-    if ( debug ){
-      console.debug( 'handle history event for ' + tab );
-    }    
+    var found = false;
+    for ( var i=0; i<Sonia.History.recentlyAdded.length; i++ ){
+      if (Sonia.History.recentlyAdded[i] == token){
+        found = true;
+        Sonia.History.recentlyAdded.splice(i);
+        break;
+      }
+    }
+    
+    if (!found){  
+      var parts = token.split('|');
+      var id = parts[0];
+      Sonia.History.handleChange(id, parts.splice(1));
+    }
+    
   } else if (debug) {
     console.debug('history token is empty');
   }
diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.scm.js b/scm-webapp/src/main/webapp/resources/js/sonia.scm.js
index f83dd01c54..a285a660a9 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.scm.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.scm.js
@@ -446,7 +446,7 @@ Ext.onReady(function(){
     listeners: {
       tabchange: function(tabPanel, tab){
         if ( Ext.isDefined(tab) ){
-          Ext.History.add(tab.id);
+          Sonia.History.add(tab.id, true);
         }
       }
     }
diff --git a/scm-webapp/src/main/webapp/resources/js/user/sonia.user.grid.js b/scm-webapp/src/main/webapp/resources/js/user/sonia.user.grid.js
index 630548dc9f..ea71d7cd9a 100644
--- a/scm-webapp/src/main/webapp/resources/js/user/sonia.user.grid.js
+++ b/scm-webapp/src/main/webapp/resources/js/user/sonia.user.grid.js
@@ -103,11 +103,7 @@ Sonia.user.Grid = Ext.extend(Sonia.rest.Grid, {
       console.debug( item.name + ' selected' );
     }
     
-    var token = Ext.History.getToken();
-    if ( token ){
-      var parts = token.split('|');
-      Ext.History.add(parts[0] + '|' + item.name);
-    }
+    Sonia.History.append(item.name);
     
     var panel = new Sonia.user.FormPanel({
       item: item,