diff --git a/src/components/haex/pass/group/breadcrumbs.vue b/src/components/haex/pass/group/breadcrumbs.vue
index d6d7a8e..066cc30 100644
--- a/src/components/haex/pass/group/breadcrumbs.vue
+++ b/src/components/haex/pass/group/breadcrumbs.vue
@@ -23,23 +23,39 @@
         </li>
       </template>
       <li class="ml-2">
-        <NuxtLinkLocale
-          :to="{
-            name: 'passwordGroupEdit',
-            params: { groupId: lastGroup?.id },
-          }"
+        <UiTooltip
+          :tooltip="t('edit')"
+          class="[--placement:bottom]"
         >
-          <Icon name="mdi:pencil" />
-        </NuxtLinkLocale>
+          <NuxtLinkLocale
+            :to="{
+              name: 'passwordGroupEdit',
+              params: { groupId: lastGroup?.id },
+            }"
+          >
+            <Icon name="mdi:pencil" />
+          </NuxtLinkLocale>
+        </UiTooltip>
       </li>
     </ul>
   </div>
 </template>
 
 <script setup lang="ts">
+import { UiTooltip } from '#components'
 import type { SelectHaexPasswordsGroups } from '~~/src-tauri/database/schemas/vault'
 
 const groups = defineProps<{ items: SelectHaexPasswordsGroups[] }>()
 
 const lastGroup = computed(() => groups.items.at(-1))
+
+const { t } = useI18n()
 </script>
+
+<i18n lang="yaml">
+de:
+  edit: Bearbeiten
+
+en:
+  edit: Edit
+</i18n>
diff --git a/src/components/haex/pass/mobile/menu/index.vue b/src/components/haex/pass/mobile/menu/index.vue
index a5de263..e55d611 100644
--- a/src/components/haex/pass/mobile/menu/index.vue
+++ b/src/components/haex/pass/mobile/menu/index.vue
@@ -95,7 +95,6 @@ const onClickItemAsync = async (item: IPasswordMenuItem) => {
 
     if (!selectedItems.value.size) longPressedHook.value = false
   } else {
-    search.value = ''
     if (item.type === 'group')
       await navigateTo(
         localePath({
@@ -114,6 +113,7 @@ const onClickItemAsync = async (item: IPasswordMenuItem) => {
         }),
       )
     }
+    search.value = ''
   }
 }
 
diff --git a/src/components/ui/tooltip/index.vue b/src/components/ui/tooltip/index.vue
index 4872fd1..115d515 100644
--- a/src/components/ui/tooltip/index.vue
+++ b/src/components/ui/tooltip/index.vue
@@ -11,13 +11,10 @@
       </slot>
 
       <span
-        class="tooltip-content tooltip-shown:opacity-100 tooltip-shown:visible z-40 pointer-events-none"
+        class="tooltip-content tooltip-shown:opacity-100 tooltip-shown:visible pointer-events-none z-50"
         role="tooltip"
       >
-        <span
-          class="tooltip-body"
-          v-bind="$attrs"
-        >
+        <span class="tooltip-body">
           {{ tooltip }}
         </span>
       </span>
@@ -57,8 +54,4 @@ const props = defineProps({
     default: 'hover',
   },
 })
-
-defineOptions({
-  inheritAttrs: false,
-})
 </script>
diff --git a/src/layouts/app.vue b/src/layouts/app.vue
index 949da14..f367cb5 100644
--- a/src/layouts/app.vue
+++ b/src/layouts/app.vue
@@ -7,7 +7,7 @@
         <button
           ref="sidebarToogleRef"
           type="button"
-          class="btn btn-text btn-square me-2 z-50"
+          class="btn btn-text btn-square me-2 z-30"
           aria-haspopup="dialog"
           aria-expanded="false"
           aria-controls="sidebar"
diff --git a/src/pages/vault/[vaultId]/passwords.vue b/src/pages/vault/[vaultId]/passwords.vue
index e8a1ebd..829afb5 100644
--- a/src/pages/vault/[vaultId]/passwords.vue
+++ b/src/pages/vault/[vaultId]/passwords.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-full overflow-auto px-2 relative">
+  <div class="h-full overflow-auto p-2 relative">
     <NuxtPage />
   </div>
 </template>
diff --git a/src/pages/vault/[vaultId]/passwords/[[groupId]]/index.vue b/src/pages/vault/[vaultId]/passwords/[[groupId]]/index.vue
index fa08718..e8f7d0b 100644
--- a/src/pages/vault/[vaultId]/passwords/[[groupId]]/index.vue
+++ b/src/pages/vault/[vaultId]/passwords/[[groupId]]/index.vue
@@ -3,7 +3,7 @@
     <div class="min-h-full flex flex-col">
       <HaexPassGroupBreadcrumbs
         :items="breadCrumbs"
-        class="px-2 sticky top-0 z-10 bg-base-200"
+        class="px-2 sticky -top-2 z-10 bg-base-200"
         v-show="breadCrumbs.length"
       />
       <div class="flex-1 overflow-auto py-1">
diff --git a/src/pages/vault/[vaultId]/passwords/[[groupId]]/item/[itemId].vue b/src/pages/vault/[vaultId]/passwords/[[groupId]]/item/[itemId].vue
index c77d31f..5ca489a 100644
--- a/src/pages/vault/[vaultId]/passwords/[[groupId]]/item/[itemId].vue
+++ b/src/pages/vault/[vaultId]/passwords/[[groupId]]/item/[itemId].vue
@@ -110,6 +110,7 @@
 
     <HaexPassDialogUnsavedChanges
       :has-changes="hasChanges"
+      v-model:ignore-changes="ignoreChanges"
       @abort="showUnsavedChangesDialog = false"
       @confirm="onConfirmIgnoreChanges"
       v-model:open="showUnsavedChangesDialog"
@@ -189,6 +190,7 @@ const { deleteAsync, updateAsync } = usePasswordItemStore()
 const { syncGroupItemsAsync } = usePasswordGroupStore()
 const { currentGroupId, inTrashGroup } = storeToRefs(usePasswordGroupStore())
 
+const ignoreChanges = ref(false)
 const onUpdateAsync = async () => {
   try {
     const newId = await updateAsync({
@@ -200,16 +202,17 @@ const onUpdateAsync = async () => {
     })
     if (newId) add({ type: 'success', text: t('success.update') })
     syncGroupItemsAsync(currentGroupId.value)
-    onClose(true)
+    ignoreChanges.value = true
+    onClose()
   } catch (error) {
     add({ type: 'error', text: t('error.update') })
   }
 }
 
-const onClose = (ignoreChanges?: boolean) => {
+const onClose = () => {
   if (showConfirmDeleteDialog.value || showUnsavedChangesDialog.value) return
 
-  if (hasChanges.value && !ignoreChanges)
+  if (hasChanges.value && !ignoreChanges.value)
     return (showUnsavedChangesDialog.value = true)
 
   read_only.value = true
@@ -222,7 +225,7 @@ const deleteItemAsync = async () => {
     showConfirmDeleteDialog.value = false
     add({ type: 'success', text: t('success.delete') })
     await syncGroupItemsAsync(currentGroupId.value)
-    onClose(true)
+    onClose()
   } catch (errro) {
     add({
       type: 'error',
@@ -244,7 +247,8 @@ const hasChanges = computed(
 const showUnsavedChangesDialog = ref(false)
 const onConfirmIgnoreChanges = () => {
   showUnsavedChangesDialog.value = false
-  onClose(true)
+  ignoreChanges.value = true
+  onClose()
 }
 </script>