diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php
index c929416a..2402dd29 100644
--- a/site/plugins/admin/app/Controllers/EntriesController.php
+++ b/site/plugins/admin/app/Controllers/EntriesController.php
@@ -504,12 +504,10 @@ class EntriesController extends Controller
 
         if (!$this->entries->has($data['parent_entry'] . '/' . $entry_id_current)) {
             if ($this->entries->rename(
-                $entry_id_current,
+                $data['entry_id_path_current'],
                 $data['parent_entry'] . '/' . $entry_id_current
             )) {
-
-                rename(PATH['uploads'] . '/entries/' . $entry_id_current, PATH['uploads'] . '/entries/' . $data['parent_entry'] . '/' . $entry_id_current);
-
+                rename(PATH['uploads'] . '/entries/' . $data['entry_id_path_current'], PATH['uploads'] . '/entries/' . $data['parent_entry'] . '/' . $entry_id_current);
                 $this->clearEntryCounter($data['parent_entry']);
                 $this->flash->addMessage('success', __('admin_message_entry_moved'));
             } else {
diff --git a/site/plugins/admin/assets/src/base/common.css b/site/plugins/admin/assets/src/base/common.css
index 458f0a54..e5a10b00 100644
--- a/site/plugins/admin/assets/src/base/common.css
+++ b/site/plugins/admin/assets/src/base/common.css
@@ -49,3 +49,9 @@ h4
 {
     @apply text-2xl;
 }
+
+input:focus,
+button:focus,
+button:active {
+    outline: none;
+}
diff --git a/site/plugins/admin/templates/content/entries/index.html b/site/plugins/admin/templates/content/entries/index.html
index 5302d370..a6f1c047 100644
--- a/site/plugins/admin/templates/content/entries/index.html
+++ b/site/plugins/admin/templates/content/entries/index.html
@@ -285,7 +285,6 @@
             Swal.fire({
                 title: "{{ tr('admin_select_entry_type') }}",
                 showCloseButton: true,
-                focusCloseButton: false,
                 showConfirmButton: false,
                 html: $('._select-entry-type-template').html(),
                 onBeforeOpen: () => {