diff --git a/windows-terminal-quake/Toggler.cs b/windows-terminal-quake/Toggler.cs
index 6b7a26f..f14e177 100644
--- a/windows-terminal-quake/Toggler.cs
+++ b/windows-terminal-quake/Toggler.cs
@@ -67,13 +67,23 @@ public Toggler(string[] args)
 			};
 
 			// Start hidden?
-			if (Settings.Instance.StartHidden) Toggle(isOpen = false, 0);
+			if (Settings.Instance.StartHidden)
+			{
+				Toggle(!isOpen, 0);
+				isOpen = false;
+			}
+			else
+			{
+				Toggle(isOpen, 0);
+				isOpen = true;
+			}
 		}
 
 		public void Toggle(bool open, int durationMs)
 		{
-			var stepDelayMs = Settings.Instance.ToggleAnimationFrameTimeMs;
+			var stepDelayMs = Settings.Instance.ToggleAnimationFrameTimeMs == 0 ? 15 : Settings.Instance.ToggleAnimationFrameTimeMs;
 			var stepCount = durationMs / stepDelayMs;
+			if (stepCount <= 0) stepCount = 1;
 
 			var screen = GetScreenWithCursor();