diff --git a/src/components/GameState.vue b/src/components/GameState.vue
index 3de9ba10..8aff95fe 100644
--- a/src/components/GameState.vue
+++ b/src/components/GameState.vue
@@ -9,6 +9,10 @@
             {{state.stage}}
         </span>
         |
+        <span v-b-tooltip.hover title="Current command">
+            {{state.command}} <span v-if="state.commandForTeam !== ''">for {{state.commandForTeam}}</span>
+        </span>
+        |
         <span v-format-ns-duration="state.stageTimeElapsed"
               v-b-tooltip.hover
               title="Total time elapsed in the current stage">
@@ -23,10 +27,6 @@
               v-b-tooltip.hover
               title="Total real time elapsed since the match has been started">
         </span>
-        |
-        <span v-b-tooltip.hover title="Current command">
-            {{state.command}} <span v-if="state.commandForTeam !== ''">for {{state.commandForTeam}}</span>
-        </span>
     </div>
 </template>
 
diff --git a/src/components/control/ControlGeneral.vue b/src/components/control/ControlGeneral.vue
index 5294b7ba..15cc4701 100644
--- a/src/components/control/ControlGeneral.vue
+++ b/src/components/control/ControlGeneral.vue
@@ -12,7 +12,7 @@
               :title="'Robots have to keep distance to the ball (' + Object.keys(keymapStop)[0] + ')'">
             <b-button v-hotkey="keymapStop"
                       v-on:click="send('stop')"
-                      v-bind:disabled="stopped || !inNormalHalf">
+                      v-bind:disabled="stopped || !stopAllowed">
                 Stop
             </b-button>
         </span>
@@ -20,7 +20,7 @@
               :title="'Restart the game in draw situations (' + Object.keys(keymapForceStart)[0] + ')'">
             <b-button v-hotkey="keymapForceStart"
                       v-on:click="send('forceStart')"
-                      v-bind:disabled="!stopped || !inNormalHalf">
+                      v-bind:disabled="!stopped || !forceStartAllowed">
                 Force Start
             </b-button>
         </span>
@@ -28,7 +28,7 @@
               :title="'Continue game after a prepare state (' + Object.keys(keymapNormalStart)[0] + ')'">
             <b-button v-hotkey="keymapNormalStart"
                       v-on:click="send('normalStart')"
-                      v-bind:disabled="!prepareSth || !inNormalHalf">
+                      v-bind:disabled="!prepareSth || !normalStartAllowed">
                 Normal Start
             </b-button>
         </span>
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-    import {isInNormalHalf} from "../../main";
+    import {isNonPausedStage, isPreStage} from "../../refereeState";
 
     export default {
         name: "ControlGeneral",
@@ -84,8 +84,15 @@
             prepareSth() {
                 return this.state.command === 'kickoff' || this.state.command === 'penalty';
             },
-            inNormalHalf() {
-                return isInNormalHalf(this.state);
+            forceStartAllowed() {
+                return isNonPausedStage(this.state);
+            },
+            normalStartAllowed() {
+                return isNonPausedStage(this.state) || this.state.command === 'kickoff';
+            },
+            stopAllowed() {
+                return isNonPausedStage(this.$store.state.refBoxState)
+                    || isPreStage(this.$store.state.refBoxState);
             },
             gameEventPresent() {
                 return this.state.gameEvent !== 'none';
diff --git a/src/components/control/ControlMatch.vue b/src/components/control/ControlMatch.vue
index 5d06ea31..aeb0d7fb 100644
--- a/src/components/control/ControlMatch.vue
+++ b/src/components/control/ControlMatch.vue
@@ -21,12 +21,12 @@
         </b-button>
         <b-button v-b-tooltip.hover title="Change back to the previous stage (if something went wrong)"
                   v-on:click="previousStage"
-                  :disabled="forbidMatchControls">
+                  :disabled="forbidMatchControls || noPreviousStage">
             Previous Stage
         </b-button>
         <b-button v-b-tooltip.hover title="Proceed to the next stage"
                   v-on:click="nextStage"
-                  :disabled="forbidMatchControls">
+                  :disabled="forbidMatchControls || noNextStage">
             Next Stage
         </b-button>
     </div>
@@ -79,6 +79,12 @@
             },
             forbidMatchControls() {
                 return !this.stopped && !this.halted;
+            },
+            noPreviousStage() {
+                return this.state.stage === 'Pre-First Half';
+            },
+            noNextStage() {
+                return this.state.stage === 'End of Game';
             }
         }
     }
diff --git a/src/components/control/ControlTeam.vue b/src/components/control/ControlTeam.vue
index 3d83733c..473970b1 100644
--- a/src/components/control/ControlTeam.vue
+++ b/src/components/control/ControlTeam.vue
@@ -12,7 +12,7 @@
               :title="'Perform direct kick (corner and goal kicks) (' + Object.keys(keymapDirect)[0] + ')'">
         <b-button v-hotkey="keymapDirect"
                   v-on:click="send('direct')"
-                  v-bind:disabled="halted || running || preparing">
+                  v-bind:disabled="halted || running || preparing || !nonPausedStage">
             Direct
         </b-button>
         </span>
@@ -20,14 +20,14 @@
               :title="'Perform indirect kick (throw-in) (' + Object.keys(keymapIndirect)[0] + ')'">
         <b-button v-hotkey="keymapIndirect"
                   v-on:click="send('indirect')"
-                  v-bind:disabled="halted || running || preparing">
+                  v-bind:disabled="halted || running || preparing || !nonPausedStage">
             Indirect
         </b-button>
         </span>
         <span v-b-tooltip.hover
               title="Prepare for a penalty kick">
         <b-button v-on:click="send('penalty')"
-                  v-bind:disabled="halted || running || preparing">
+                  v-bind:disabled="halted || running || preparing || !nonPausedStage">
             Penalty
         </b-button>
         </span>
@@ -54,6 +54,7 @@
 
 <script>
     import ControlTeamTimeout from "./ControlTeamTimeout";
+    import {isNonPausedStage} from "../../refereeState";
 
     export default {
         name: "ControlTeam",
@@ -125,6 +126,9 @@
             preparing() {
                 return this.state.command === 'kickoff' || this.state.command === 'penalty';
             },
+            nonPausedStage() {
+                return isNonPausedStage(this.state);
+            },
         }
     }
 </script>
diff --git a/src/components/control/ControlTeamTimeout.vue b/src/components/control/ControlTeamTimeout.vue
index 7ce3f2f2..9d7eb1a4 100644
--- a/src/components/control/ControlTeamTimeout.vue
+++ b/src/components/control/ControlTeamTimeout.vue
@@ -2,7 +2,7 @@
     <span>
         <b-button v-show="!timeoutRunning"
                   v-on:click="startTimeout"
-                  v-bind:disabled="!inNormalHalf">
+                  v-bind:disabled="disableTimeoutButton">
             Start Timeout
         </b-button>
         <b-button v-show="timeoutRunning"
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-    import {isInNormalHalf} from "../../main";
+    import {isNonPausedStage, isPreStage} from "../../refereeState";
 
     export default {
         name: "ControlTeamTimeout",
@@ -27,8 +27,9 @@
             timeoutRunning: function () {
                 return this.command === "timeout" && this.$store.state.refBoxState.commandForTeam === this.teamColor
             },
-            inNormalHalf() {
-                return isInNormalHalf(this.$store.state.refBoxState);
+            disableTimeoutButton() {
+                return !isNonPausedStage(this.$store.state.refBoxState)
+                    && !isPreStage(this.$store.state.refBoxState);
             },
         },
         methods: {
diff --git a/src/main.js b/src/main.js
index 17049033..ceefa9e6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,10 +27,6 @@ library.add(faCaretSquareDown);
 library.add(faCaretSquareUp);
 Vue.component('font-awesome-icon', FontAwesomeIcon);
 
-export let isInNormalHalf = function (state) {
-    return state.stage === 'First Half';
-};
-
 let wsAddress;
 if (process.env.NODE_ENV === 'development') {
     // use the default backend port
diff --git a/src/refereeState.js b/src/refereeState.js
new file mode 100644
index 00000000..5f8e4581
--- /dev/null
+++ b/src/refereeState.js
@@ -0,0 +1,15 @@
+export let isNonPausedStage = function (state) {
+    return state.stage === 'First Half'
+        || state.stage === 'Second Half'
+        || state.stage === 'Overtime First Half'
+        || state.stage === 'Overtime Second Half'
+        || state.stage === 'Shootout';
+};
+
+export let isPreStage = function (state) {
+    return state.stage === 'Pre-First Half'
+        || state.stage === 'Pre-Second Half'
+        || state.stage === 'Pre-Overtime First Half'
+        || state.stage === 'Pre-Overtime Second Half'
+        || state.stage === 'Shootout';
+};
\ No newline at end of file