diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm
index 2ee3d634b05..99e69a84c53 100644
--- a/code/modules/mob/living/silicon/robot/login.dm
+++ b/code/modules/mob/living/silicon/robot/login.dm
@@ -1,11 +1,12 @@
 
-
 /mob/living/silicon/robot/Login()
 	..()
 	regenerate_icons()
 	show_laws(0)
 	if(mind)	ticker.mode.remove_revolutionary(mind)
 
-	winset(src, null, "mainwindow.macro=borgmacro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5")
+/mob/living/silicon/robot/update_hotkey_mode()
+	winset(src, null, "mainwindow.macro=borghotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#F0F0F0")
 
-	return
\ No newline at end of file
+/mob/living/silicon/robot/update_normal_mode()
+	winset(src, null, "mainwindow.macro=borgmacro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5")
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 4dfaf4be75d..a99a9f66a84 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -47,6 +47,20 @@
 	if(isobj(loc))
 		var/obj/Loc=loc
 		Loc.on_log()
-	//set macro to normal incase it was overriden (like cyborg currently does)
+
+	update_interface()
+
+/mob/proc/update_interface()
+	if(client)
+		if(winget(src, "hotkey_toggle", "is-checked"))
+			update_hotkey_mode()
+		else
+			update_normal_mode()
+
+/mob/proc/update_hotkey_mode()
+	winset(src, null, "mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true input.background-color=#F0F0F0")
+
+/mob/proc/update_normal_mode()
 	winset(src, null, "mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5")
 
+