diff --git a/src/tracker/gui.js b/src/tracker/gui.js
index ac4ae09..a6917f0 100644
--- a/src/tracker/gui.js
+++ b/src/tracker/gui.js
@@ -11,6 +11,7 @@ var GUI = (function(){
       }
       
       if (type === "tracking" || force){
+        controller.ui.btnUpload.disabled = controller.ui.btnSettings.disabled = STATE.isTracking();
         controller.ui.btnToggleTracking.innerHTML = STATE.isTracking() ? "Pause Tracking" : "Start Tracking";
       }
     }