Index: /windows/neo-vars/src/source/initialize.ahk
===================================================================
--- /windows/neo-vars/src/source/initialize.ahk	(revision 1246)
+++ /windows/neo-vars/src/source/initialize.ahk	(revision 1557)
@@ -35,5 +35,7 @@
 
 SetCapsLockState Off
+Gosub, SaveNumLockState
 SetNumLockState Off
+OnExit, exitprogram
 SetScrollLockState Off
 KeyboardLED(2,"off") ; deaktivieren, falls sie doch brennt
Index: /windows/neo-vars/src/source/trayfunctions.ahk
===================================================================
--- /windows/neo-vars/src/source/trayfunctions.ahk	(revision 1223)
+++ /windows/neo-vars/src/source/trayfunctions.ahk	(revision 1557)
@@ -4,10 +4,13 @@
     menu, tray, tip, %name%
     menu, tray, icon, %ResourceFolder%\neo_enabled.ico,,1
-    suspend , off ; Schaltet Suspend aus -> NEO
+    Gosub, SaveNumLockState
+    SetNumLockState Off
+    suspend, off ; Schaltet Suspend aus -> NEO
   } else {
     menu, tray, rename, %disable%, %enable%
     menu, tray, tip, %name% : Deaktiviert
     menu, tray, icon, %ResourceFolder%\neo_disabled.ico,,1
-    suspend , on  ; Schaltet Suspend ein -> QWERTZ
+    SetNumLockState, %SavedNumLockState%
+    suspend, on  ; Schaltet Suspend ein -> QWERTZ
   }
 return
@@ -59,5 +62,13 @@
 
 exitprogram:
+  SetNumLockState, %SavedNumLockState%
   exitapp
 return
 
+SaveNumLockState:
+  if GetKeyState("NumLock","T")
+    SavedNumLockState = On
+  else
+    SavedNumLockState = Off
+return
+