diff --git a/TGControlPanel/ServerPage.cs b/TGControlPanel/ServerPage.cs
index ba5419d575..887ceffd79 100644
--- a/TGControlPanel/ServerPage.cs
+++ b/TGControlPanel/ServerPage.cs
@@ -150,10 +150,11 @@ namespace TGControlPanel
 				var Online = DD.DaemonStatus() == TGDreamDaemonStatus.Online;
 				ServerGStopButton.Enabled = Online;
 				ServerGRestartButton.Enabled = Online;
+				ServerStopButton.Enabled = Online;
+				ServerRestartButton.Enabled = Online;
 
 				var ShuttingDown = DD.ShutdownInProgress();
 				ServerGStopButton.Checked = ShuttingDown;
-				ServerGStopButton.Enabled = !ShuttingDown;
 
 				AutostartCheckbox.Checked = DD.Autostart();
 				WebclientCheckBox.Checked = DD.Webclient();