diff --git a/bitbake/lib/toaster/toastergui/static/js/base.js b/bitbake/lib/toaster/toastergui/static/js/base.js
index 0fb1f8b6bf..c99f8cdc54 100644
--- a/bitbake/lib/toaster/toastergui/static/js/base.js
+++ b/bitbake/lib/toaster/toastergui/static/js/base.js
@@ -62,7 +62,9 @@ function basePageInit(ctx) {
   libtoaster.makeTypeahead(newBuildTargetInput, selectedProject.projectTargetsUrl, { format: "json" }, function (item) {
         /* successfully selected a target */
       selectedTarget = item;
-  });
+      newBuildTargetBuildBtn.removeAttr("disabled");
+    });
+  }
 
   newBuildTargetInput.on('input', function () {
     if ($(this).val().length === 0) {
@@ -105,8 +107,8 @@ function basePageInit(ctx) {
           $("#new-build-button .alert").hide();
 
           /* we can build this project; enable input fields */
-          newBuildTargetInput.prop("disabled", false);
-          newBuildTargetBuildBtn.prop("disabled", false);
+          newBuildTargetInput.removeAttr("disabled");
+          newBuildTargetBuildBtn.removeAttr("disabled");
        }
       }, null);
   }
@@ -144,13 +146,13 @@ function basePageInit(ctx) {
       /* Update the typeahead project_id paramater */
       _checkProjectBuildable();
 
-      newBuildTargetInput.prop("disabled", false);
-      newBuildTargetBuildBtn.prop("disabled", false);
+      newBuildTargetInput.removeAttr("disabled");
 
       /* Update the typeahead to use the new selectedProject */
       libtoaster.makeTypeahead(newBuildTargetInput, selectedProject.projectTargetsUrl, { format: "json" }, function (item) {
         /* successfully selected a target */
         selectedTarget = item;
+        newBuildTargetBuildBtn.removeAttr("disabled");
       });
 
       newBuildTargetInput.val("");