diff --git a/GameData/Pilot Assistant/PilotAssistant.dll b/GameData/Pilot Assistant/PilotAssistant.dll
index c274d46..5a4c281 100644
Binary files a/GameData/Pilot Assistant/PilotAssistant.dll and b/GameData/Pilot Assistant/PilotAssistant.dll differ
diff --git a/PilotAssistant/FlightModules/SurfSAS.cs b/PilotAssistant/FlightModules/SurfSAS.cs
index fd9913b..be598d9 100644
--- a/PilotAssistant/FlightModules/SurfSAS.cs
+++ b/PilotAssistant/FlightModules/SurfSAS.cs
@@ -398,12 +398,15 @@ private void drawSSASWindow(int id)
 
             if (bArmed)
             {
-                if (currentMode == VesselAutopilot.AutopilotMode.StabilityAssist)
+                if (!(FlightUIController.speedDisplayMode == FlightUIController.SpeedDisplayModes.Orbit && currentMode == VesselAutopilot.AutopilotMode.StabilityAssist))
                 {
-                    SASList.Pitch.GetSAS(this).SetPoint = TogPlusNumBox("Pitch:", SASList.Pitch, vesRef.vesselData.pitch, 80, 70);
-                    SASList.Hdg.GetSAS(this).SetPoint = TogPlusNumBox("Heading:", SASList.Hdg, vesRef.vesselData.heading, 80, 70);
+                    if (currentMode == VesselAutopilot.AutopilotMode.StabilityAssist)
+                    {
+                        SASList.Pitch.GetSAS(this).SetPoint = TogPlusNumBox("Pitch:", SASList.Pitch, vesRef.vesselData.pitch, 80, 70);
+                        SASList.Hdg.GetSAS(this).SetPoint = TogPlusNumBox("Heading:", SASList.Hdg, vesRef.vesselData.heading, 80, 70);
+                    }
+                    SASList.Bank.GetSAS(this).SetPoint = TogPlusNumBox("Roll:", SASList.Bank, vesRef.vesselData.bank, 80, 70);
                 }
-                SASList.Bank.GetSAS(this).SetPoint = TogPlusNumBox("Roll:", SASList.Bank, vesRef.vesselData.bank, 80, 70);
 
                 GUILayout.Box("", GUILayout.Height(10)); // seperator