diff --git a/CHANGELOG b/CHANGELOG
index ac14af9d2d02c61a4e9b6a73847fd609eb154e67..2f93fcdbaa0cf8aec677e2cb21ce44094a2e86bb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -37,6 +37,7 @@ v 8.9.5 (unreleased)
   - Fix assigning shared runners as admins. !4961
   - Show "locked" label for locked runners on runners admin. !4961
   - Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1
+  - Fix import button disabled when import process fail due to the namespace already been taken.
 
 v 8.9.4
   - Fix privilege escalation issue with OAuth external users.
diff --git a/app/assets/javascripts/importer_status.js.coffee b/app/assets/javascripts/importer_status.js.coffee
index b0edc8956498d17e5b2733e88021b4b3136d3e8e..eb046eb2eff90b60ab308459cb2548260c7d0987 100644
--- a/app/assets/javascripts/importer_status.js.coffee
+++ b/app/assets/javascripts/importer_status.js.coffee
@@ -7,13 +7,16 @@ class @ImporterStatus
     $('.js-add-to-import')
       .off 'click'
       .on 'click', (e) =>
-        new_namespace = null
         $btn = $(e.currentTarget)
         $tr = $btn.closest('tr')
+        $target_field = $tr.find('.import-target')
+        $namespace_input = $target_field.find('input')
         id = $tr.attr('id').replace('repo_', '')
-        if $tr.find('.import-target input').length > 0
-          new_namespace = $tr.find('.import-target input').prop('value')
-          $tr.find('.import-target').empty().append("#{new_namespace} / #{$tr.find('.import-target').data('project_name')}")
+        new_namespace = null
+
+        if $namespace_input.length > 0
+          new_namespace = $namespace_input.prop('value')
+          $target_field.empty().append("#{new_namespace}/#{$target_field.data('project_name')}")
 
         $btn
           .disable()
diff --git a/app/views/import/base/create.js.haml b/app/views/import/base/create.js.haml
index dfebf7768d9a7d4509daf401cd2aae5696e45b81..804ad88468f31c205c2c88d82f1a04a3c30fb12f 100644
--- a/app/views/import/base/create.js.haml
+++ b/app/views/import/base/create.js.haml
@@ -1,6 +1,8 @@
 - if @already_been_taken
   :plain
-    target_field = $("tr#repo_#{@repo_id} .import-target")
+    tr = $("tr#repo_#{@repo_id}")
+    target_field = tr.find(".import-target")
+    import_button = tr.find(".btn-import")
     origin_target = target_field.text()
     project_name = "#{@project_name}"
     origin_namespace = "#{@target_namespace}"
@@ -10,6 +12,7 @@
     target_field.append("/" + project_name)
     target_field.data("project_name", project_name)
     target_field.find('input').prop("value", origin_namespace)
+    import_button.enable().removeClass('is-loading')
 - elsif @access_denied
   :plain
     job = $("tr#repo_#{@repo_id}")