diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73300d7a6..570e3fd52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * Support for creating server without having to assign a node and allocation manually. Simply select the checkbox or pass `auto_deploy=true` to the API to auto-select a node and allocation given a location.
 
 ### Changed
+* Prevent clicking server start button until server is completely off, not just stopping.
+
 ### Fixed
 * Team Fortress named 'Insurgency' in panel in database seeder. ([#96](https://github.com/Pterodactyl/Panel/issues/96), PR by [@MeltedLux](https://github.com/MeltedLux))
 * Server allocation listing display now showing the connection IP unless an alias was assigned.
diff --git a/resources/views/server/index.blade.php b/resources/views/server/index.blade.php
index 0612c0ca8..0355e9b1f 100644
--- a/resources/views/server/index.blade.php
+++ b/resources/views/server/index.blade.php
@@ -442,7 +442,9 @@ $(window).load(function () {
             $('[data-attr="power"][data-action="start"]').addClass('disabled');
             $('[data-attr="power"][data-action="stop"], [data-attr="power"][data-action="restart"]').removeClass('disabled');
         } else {
-            $('[data-attr="power"][data-action="start"]').removeClass('disabled');
+            if (data == 0) {
+                $('[data-attr="power"][data-action="start"]').removeClass('disabled');
+            }
             $('[data-attr="power"][data-action="stop"], [data-attr="power"][data-action="restart"]').addClass('disabled');
         }