diff --git a/cl_radar.lua b/cl_radar.lua
index 36a53b1..b3bbfb4 100644
--- a/cl_radar.lua
+++ b/cl_radar.lua
@@ -41,7 +41,66 @@ local pairs = pairs
 
 
 --[[----------------------------------------------------------------------------------
-	UI loading trigger
+	Key bind registering 
+----------------------------------------------------------------------------------]]--
+local function RegisterKeyBinds()
+	-- Opens the remote control
+	RegisterCommand( "radar_remote", function()
+		if ( not RADAR:GetKeyLockState() ) then
+			RADAR:OpenRemote()
+		end
+	end )
+	RegisterKeyMapping( "radar_remote", "Open Remote Control", "keyboard", CONFIG.keyDefaults.remote_control )
+
+	-- Locks speed from front antenna
+	RegisterCommand( "radar_fr_ant", function()
+		if ( not RADAR:GetKeyLockState() ) then
+			RADAR:LockAntennaSpeed( "front" )
+		end
+	end )
+	RegisterKeyMapping( "radar_fr_ant", "Front Antenna Lock/Unlock", "keyboard", CONFIG.keyDefaults.front_lock )
+
+	-- Locks speed from rear antenna
+	RegisterCommand( "radar_bk_ant", function()
+		if ( not RADAR:GetKeyLockState() ) then
+			RADAR:LockAntennaSpeed( "rear" )
+		end
+	end )
+	RegisterKeyMapping( "radar_bk_ant", "Rear Antenna Lock/Unlock", "keyboard", CONFIG.keyDefaults.rear_lock )
+
+	-- Locks front plate reader
+	RegisterCommand( "radar_fr_cam", function()
+		if ( not RADAR:GetKeyLockState() ) then
+			READER:LockCam( "front", true, false )
+		end
+	end )
+	RegisterKeyMapping( "radar_fr_cam", "Front Plate Reader Lock/Unlock", "keyboard", CONFIG.keyDefaults.plate_front_lock )
+
+	-- Locks rear plate reader
+	RegisterCommand( "radar_bk_cam", function()
+		if ( not RADAR:GetKeyLockState() ) then
+			READER:LockCam( "rear", true, false )
+		end
+	end )
+	RegisterKeyMapping( "radar_bk_cam", "Rear Plate Reader Lock/Unlock", "keyboard", CONFIG.keyDefaults.plate_rear_lock )
+
+	-- Toggles the key lock state
+	RegisterCommand( "radar_key_lock", function()
+		RADAR:ToggleKeyLock()
+	end )
+	RegisterKeyMapping( "radar_key_lock", "Toggle Keybind Lock", "keyboard", CONFIG.keyDefaults.key_lock )
+
+	-- Deletes all of the KVPs
+	RegisterCommand( "reset_radar_data", function()
+		DeleteResourceKvp( "wk_wars2x_ui_data" )
+		DeleteResourceKvp( "wk_wars2x_om_data" )
+		DeleteResourceKvp( "wk_wars2x_new_user" )
+	end, false )
+end 
+
+
+--[[----------------------------------------------------------------------------------
+	UI loading and key binds trigger
 ----------------------------------------------------------------------------------]]--
 local spawned = false 
 
@@ -68,6 +127,7 @@ end
 -- the player spawns
 AddEventHandler( "playerSpawned", function()
 	if ( not spawned ) then 
+		RegisterKeyBinds()
 		LoadUISettings()
 
 		spawned = true
@@ -80,6 +140,7 @@ AddEventHandler( "onResourceStart", function( resourceName )
 	if ( GetCurrentResourceName() == resourceName ) then 
 		Citizen.Wait( 2000 )
 
+		RegisterKeyBinds()
 		LoadUISettings()
 	end 
 end )
@@ -1813,61 +1874,4 @@ Citizen.CreateThread( function()
 		-- Wait 3 seconds
 		Citizen.Wait( 3000 )
 	end 
-end )
-
-Citizen.CreateThread( function()
-	Citizen.Wait( 3000 )
-	
-	-- Opens the remote control
-	RegisterCommand( "radar_remote", function()
-		if ( not RADAR:GetKeyLockState() ) then
-			RADAR:OpenRemote()
-		end
-	end )
-	RegisterKeyMapping( "radar_remote", "Open Remote Control", "keyboard", CONFIG.keyDefaults.remote_control )
-
-	-- Locks speed from front antenna
-	RegisterCommand( "radar_fr_ant", function()
-		if ( not RADAR:GetKeyLockState() ) then
-			RADAR:LockAntennaSpeed( "front" )
-		end
-	end )
-	RegisterKeyMapping( "radar_fr_ant", "Front Antenna Lock/Unlock", "keyboard", CONFIG.keyDefaults.front_lock )
-
-	-- Locks speed from rear antenna
-	RegisterCommand( "radar_bk_ant", function()
-		if ( not RADAR:GetKeyLockState() ) then
-			RADAR:LockAntennaSpeed( "rear" )
-		end
-	end )
-	RegisterKeyMapping( "radar_bk_ant", "Rear Antenna Lock/Unlock", "keyboard", CONFIG.keyDefaults.rear_lock )
-
-	-- Locks front plate reader
-	RegisterCommand( "radar_fr_cam", function()
-		if ( not RADAR:GetKeyLockState() ) then
-			READER:LockCam( "front", true, false )
-		end
-	end )
-	RegisterKeyMapping( "radar_fr_cam", "Front Plate Reader Lock/Unlock", "keyboard", CONFIG.keyDefaults.plate_front_lock )
-
-	-- Locks rear plate reader
-	RegisterCommand( "radar_bk_cam", function()
-		if ( not RADAR:GetKeyLockState() ) then
-			READER:LockCam( "rear", true, false )
-		end
-	end )
-	RegisterKeyMapping( "radar_bk_cam", "Rear Plate Reader Lock/Unlock", "keyboard", CONFIG.keyDefaults.plate_rear_lock )
-
-	-- Toggles the key lock state
-	RegisterCommand( "radar_key_lock", function()
-		RADAR:ToggleKeyLock()
-	end )
-	RegisterKeyMapping( "radar_key_lock", "Toggle Keybind Lock", "keyboard", CONFIG.keyDefaults.key_lock )
-
-	-- Deletes all of the KVPs
-	RegisterCommand( "reset_radar_data", function()
-		DeleteResourceKvp( "wk_wars2x_ui_data" )
-		DeleteResourceKvp( "wk_wars2x_om_data" )
-		DeleteResourceKvp( "wk_wars2x_new_user" )
-	end, false )
 end )
\ No newline at end of file