diff --git a/src/components/NavBar.js b/src/components/NavBar.js
index 4c7369e..e985cfb 100644
--- a/src/components/NavBar.js
+++ b/src/components/NavBar.js
@@ -11,6 +11,7 @@ export default class NavBar extends Component {
     this.state = {
       modalOpen_activeArm: false,
       modalOpacity: 0,
+      mode: "idle"
     };
     this.openModal = this.openModal.bind(this);
     this.closeModal = this.closeModal.bind(this);
@@ -46,11 +47,13 @@ export default class NavBar extends Component {
     try {
       const message = JSON.parse(event.data);
       if (message.type === "mode") {
-        let mode = JSON.parse(message.data).mode.toLowerCase();
-        console.log("Current Mode: " + mode);
-        if (mode === "idle") {
+        let currentMode = JSON.parse(message.data).mode.toLowerCase();
+        this.setState({ mode: currentMode });
+        console.log("Current Mode: " + currentMode);
+        if (currentMode === "idle") {
           setTimeout(() => {
-            if (mode === "idle") {
+            console.log("State Mode: " + this.state.mode);
+            if (this.state.mode === "idle") {
               this.closeModal("modalOpen_activeArm");
             }
           }, 3000);