diff --git a/Client/Business/cardealer.js b/Client/Business/cardealer.js
index 43d25c2b..ea146173 100644
--- a/Client/Business/cardealer.js
+++ b/Client/Business/cardealer.js
@@ -43,7 +43,8 @@ mp.events.add('ShopVehicle_OpenMenu', (businessName, price) => {
 
     shopMenu.MenuClose.on(() => {
         mp.gui.chat.show(true);
-    })
+        mp.players.local.taskLeaveVehicle(veh.handle, 0);
+    });
 
     shopMenu.Open();
 });
\ No newline at end of file
diff --git a/Server/Events/Key.cs b/Server/Events/Key.cs
index 8f2e138e..adda3819 100644
--- a/Server/Events/Key.cs
+++ b/Server/Events/Key.cs
@@ -200,10 +200,26 @@ namespace reallife_gamemode.Server.Events
             {
                 Vehicle v = player.Vehicle;
                 bool state = VehicleStreaming.GetEngineState(v);
-                NAPI.Util.ConsoleOutput("changing engine state: " + state.ToString());
+                ServerVehicle sV = v.GetServerVehicle();
+                if (sV != null)
+                {
+                    if (sV is ShopVehicle)
+                    {
+                        VehicleStreaming.SetEngineState(v, false);
+                        return;
+                    }
+                    else if(sV is FactionVehicle fV)
+                    {
+                        if(fV.FactionId != player.GetUser().FactionId && !state)
+                        {
+                            return;
+                        }
+                    }
+                }
                 VehicleStreaming.SetEngineState(v, !state);
             }
         }
+
         [RemoteEvent("keyPress:X")]
         public void KeyPressX(Client player)
         {