diff --git a/js/connection.js b/js/connection.js
index e80c031..705cc43 100644
--- a/js/connection.js
+++ b/js/connection.js
@@ -216,6 +216,11 @@ weechat.factory('connection',
             return;
         }
 
+        // reinitialise everything, clear all buffers
+        // TODO: this can be further extended in the future by looking
+        // at the last line in ever buffer and request more buffers from
+        // WeeChat based on that
+        models.reinitialize();
         $rootScope.reconnecting = true;
         // Have to do this to get the reconnect banner to show
         $rootScope.$apply();
diff --git a/js/websockets.js b/js/websockets.js
index 44fb552..f7c632b 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -109,6 +109,8 @@ function($rootScope, $q) {
             // otherwise emit it
             $rootScope.$emit('onMessage', message);
         }
+        // Make sure all UI is updated with new data
+        $rootScope.$apply();
 
     };