diff --git a/app/javascript/vue/shared/select_search.vue b/app/javascript/vue/shared/select_search.vue
index 832e7ca91..822c4fd7b 100644
--- a/app/javascript/vue/shared/select_search.vue
+++ b/app/javascript/vue/shared/select_search.vue
@@ -1,6 +1,7 @@
 <template>
   <Select
-    class="sn-select sn-select--search hover:border-sn-sleepy-grey"
+    tabindex="0"
+    class="sn-select sn-select--search hover:border-sn-sleepy-grey focus:outline-none focus:ring-0 focus:border-sn-sleepy-grey"
     :class="customClass"
     :className="className"
     :optionsClassName="optionsClassName"
diff --git a/app/javascript/vue/shared/wizard_modal.vue b/app/javascript/vue/shared/wizard_modal.vue
index cdc2b4ee3..263ad7bed 100644
--- a/app/javascript/vue/shared/wizard_modal.vue
+++ b/app/javascript/vue/shared/wizard_modal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="modal" class="modal" tabindex="-1" role="dialog">
+  <div ref="modal" class="modal" tabindex="-1" role="dialog" data-backdrop="static" data-keyboard="false">
     <div class="modal-dialog !w-[900px]" role="document">
       <div class="modal-content !p-0 grid grid-cols-3">
         <div class="bg-sn-super-light-grey p-6 mb-1.5">