diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm b/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm
index 57cc1b53a..bda2792b8 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm
+++ b/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm
@@ -38,3 +38,9 @@
         </div>
     <?= Form::close() ?>
 </div>
+<script>
+    setTimeout(
+            function(){ $('#relationManagePivotPopup input.form-control:first').focus() },
+            310
+    )
+</script>
\ No newline at end of file
diff --git a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm
index 1e356ca42..c27b4d6e5 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm
+++ b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm
@@ -2,7 +2,7 @@
 
     <?= Form::ajax('onRelationManagePivotUpdate', [
         'data' => ['_relation_field' => $relationField, 'manage_id' => $relationManageId],
-        'data-stripe-load-indicator' => true
+        'data-popup-load-indicator' => true
     ]) ?>
 
         <div class="modal-header">
@@ -23,8 +23,7 @@
             <?php else: ?>
                 <button
                     type="submit"
-                    class="btn btn-primary"
-                    data-dismiss="popup">
+                    class="btn btn-primary">
                     <?= e(trans('backend::lang.relation.update')) ?>
                 </button>
                 <button
@@ -42,7 +41,7 @@
 
     <?= Form::ajax('onRelationManagePivotCreate', [
         'data' => ['_relation_field' => $relationField, 'foreign_id' => $foreignId],
-        'data-stripe-load-indicator' => true
+        'data-popup-load-indicator' => true
     ]) ?>
 
         <div class="modal-header">
@@ -55,8 +54,7 @@
         <div class="modal-footer">
             <button
                 type="submit"
-                class="btn btn-primary"
-                data-dismiss="popup">
+                class="btn btn-primary">
                 <?= e(trans('backend::lang.relation.add')) ?>
             </button>
             <button