diff --git a/app/skill-picker/skill-picker.controller.js b/app/skill-picker/skill-picker.controller.js
index 70416f790..e34eb5f2b 100644
--- a/app/skill-picker/skill-picker.controller.js
+++ b/app/skill-picker/skill-picker.controller.js
@@ -15,6 +15,7 @@
     vm.toggleSkill = toggleSkill;
     vm.tracks = {};
     vm.mySkills = [];
+    vm.disableDoneButton = false;
     ///////
     activate();
 
@@ -57,6 +58,7 @@
               .then(function(resp) {
                 vm.saving = false;
                 toaster.pop('success', "Success!", "Your skills have been updated.");
+                vm.disableDoneButton = true;
                 $state.go('dashboard');
               })
               .catch(function(data) {
@@ -66,6 +68,7 @@
           } else {
             vm.saving = false;
             toaster.pop('success', "Success!", "Your skills have been updated.");
+            vm.disableDoneButton = true;
             $state.go('dashboard');
           }
 
diff --git a/app/skill-picker/skill-picker.jade b/app/skill-picker/skill-picker.jade
index 4c487bae1..63f450525 100644
--- a/app/skill-picker/skill-picker.jade
+++ b/app/skill-picker/skill-picker.jade
@@ -51,4 +51,4 @@
     type="button",
     tc-busy-button, tc-busy-when="vm.saving",
     ng-click="vm.submitSkills()",
-    ng-disabled="!vm.tracks.DESIGN && !vm.tracks.DEVELOP && !vm.tracks.DATA_SCIENCE") Done
+    ng-disabled="vm.disableDoneButton || (!vm.tracks.DESIGN && !vm.tracks.DEVELOP && !vm.tracks.DATA_SCIENCE)") Done