diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index f5c63dd08..8fd0d54fc 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1237,6 +1237,21 @@ public:
             self->setDocumentPassword(type);
             return;
         }
+        else if(type == LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE)
+        {
+            for (auto& it : self->_sessions)
+            {
+                std::shared_ptr<ChildSession> session = it.second;
+                if (session)
+                {
+                    if (!it.second->isCloseFrame())
+                    {
+                        session->loKitCallback(type, payload);
+                    }
+                }
+            }
+            return;
+        }
 
         // Broadcast leftover status indicator callbacks to all clients
         self->broadcastCallbackToClients(type, payload);
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 9a7b1dbe0..a5b3abf90 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -710,7 +710,7 @@ L.Socket = L.Class.extend({
 		}
 		else if (textMsg.startsWith('statusindicator:')) {
 			//FIXME: We should get statusindicator when saving too, no?
-			this._map.showBusy(_('Connecting...'), false);
+			this._map.showBusy(_('Connecting...'), true);
 			if (textMsg.startsWith('statusindicator: ready')) {
 				// We're connected: cancel timer and dialog.
 				this.ReconnectCount = 0;