diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.global.js b/scm-webapp/src/main/webapp/resources/js/sonia.global.js
index 5fa51f6b48..e6eb8413ff 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.global.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.global.js
@@ -112,4 +112,4 @@ var main = null;
 Ext.QuickTips.init();
 
 // enable history
-Ext.History.init();
\ No newline at end of file
+// Ext.History.init();
\ No newline at end of file
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 a7b7dc1cd6..d37c534619 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.history.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.history.js
@@ -32,7 +32,6 @@ Ext.ns('Sonia');
 
 Sonia.History = {
  
-  initialized: false,
   historyElements: [],
   recentlyAdded: [],
   recentlyChanged: [],
@@ -133,9 +132,6 @@ Sonia.History = {
   },
   
   onChange: function(token){
-    if (!this.initialized){
-      this.initialized = true;
-    }
     if(token){
       if (this.isInvokeable(this.recentlyAdded, token)){  
         var parts = token.split('|');
@@ -173,15 +169,8 @@ Sonia.History = {
 
 Ext.History.on('ready', function(history){
   var token = history.getToken();
-  if (!token || token == 'null'){
-    Sonia.History.initialized = true;  
-  } else {
-    setTimeout(function(){
-      if (debug){
-        console.debug('history ready, handle history token ' + token);
-      }      
-      Sonia.History.onChange(token);
-    }, 750);
+  if (token && token != 'null'){
+    Sonia.History.onChange(token);
   }
 });
 
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 b8cf1aa8f6..3c9e9b7aa8 100644
--- a/scm-webapp/src/main/webapp/resources/js/sonia.scm.js
+++ b/scm-webapp/src/main/webapp/resources/js/sonia.scm.js
@@ -528,6 +528,10 @@ Ext.onReady(function(){
   main.addListeners('login', loginCallbacks);
   main.addListeners('logout', logoutCallbacks);
 
+  main.addListeners('login', function(){
+    Ext.History.init();
+  });
+
   main.init();
   main.checkLogin();
 });
\ No newline at end of file