diff --git a/Client/View/NcWindow.cs b/Client/View/NcWindow.cs
index 0b8e00c6..206a431a 100644
--- a/Client/View/NcWindow.cs
+++ b/Client/View/NcWindow.cs
@@ -377,6 +377,16 @@ namespace CMS_Client.View
         {
             //Setup the Handle-variable
             MainViewHandle = Handle;
+
+
+            //Start Keyboard Hook
+            GetWindowThreadProcessId(MainViewHandle, out MainProcessPID);
+
+            if (keybhook != IntPtr.Zero)
+                UnhookWindowsHookEx(keybhook);
+            keybDelegate = new keyboardHookProc(KeybEventProc);
+            keybhook = SetWindowsHookEx(WH_KEYBOARD_LL, keybDelegate, IntPtr.Zero, 0);
+
         }
 
 
diff --git a/Step/wwwroot/src/store/alarms.store.ts b/Step/wwwroot/src/store/alarms.store.ts
index 5a3ba962..a33604ec 100644
--- a/Step/wwwroot/src/store/alarms.store.ts
+++ b/Step/wwwroot/src/store/alarms.store.ts
@@ -102,6 +102,7 @@ export const alarmsStore = {
         store._alarms.delete(alarm.guid);
 
       store.alarms = Array.from(store._alarms.values());
+      store.warnings = Array.from(store._warnings.values());
       if (Object.keys(store.alarms).length <= 0 && Object.keys(store.warnings).length <= 0)
         store.opened = false;
     },
@@ -109,6 +110,7 @@ export const alarmsStore = {
       if (store._warnings.has(alarm.guid))
         store._warnings.delete(alarm.guid);
 
+      store.alarms = Array.from(store._alarms.values());
       store.warnings = Array.from(store._warnings.values());
       if (Object.keys(store.alarms).length <= 0 && Object.keys(store.warnings).length <= 0)
         store.opened = false;
@@ -173,6 +175,8 @@ export const alarmsStore = {
       {
         store.warnings = Array.from(store._warnings.values());
         store.alarms = Array.from(store._alarms.values());
+        if (Object.keys(store.alarms).length <= 0 && Object.keys(store.warnings).length <= 0)
+          store.opened = false;
       }
     },
     CheckRemoveServiceAlarm(store, keys: Array<string>){