diff --git a/src/Mobile.vue b/src/Mobile.vue
index 82510287..dd36c363 100644
--- a/src/Mobile.vue
+++ b/src/Mobile.vue
@@ -16,11 +16,19 @@ export default {
                 name: 'lab',
                 id: 'net.mayswind.lab',
                 theme: 'ios',
+                autoDarkTheme: self.$settings.isEnableAutoDarkMode(),
                 routes: routes,
+                sheet: {
+                    backdrop: true,
+                    closeOnEscape: true
+                },
+                popup: {
+                    swipeToClose: true,
+                    closeOnEscape: true
+                },
                 view: {
                     animate : self.$settings.isEnableAnimate()
-                },
-                autoDarkTheme: self.$settings.isEnableAutoDarkMode()
+                }
             }
         }
     }
diff --git a/src/views/mobile/About.vue b/src/views/mobile/About.vue
index 314b5780..eccb8dd8 100644
--- a/src/views/mobile/About.vue
+++ b/src/views/mobile/About.vue
@@ -9,7 +9,7 @@
             <f7-list-item :title="$t('License')" link="#" popup-open=".license-popup"></f7-list-item>
         </f7-list>
 
-        <f7-popup class="license-popup" swipe-to-close close-on-escape>
+        <f7-popup class="license-popup">
             <f7-page>
                 <f7-navbar :title="$t('License')">
                     <f7-nav-right>
diff --git a/src/views/mobile/Login.vue b/src/views/mobile/Login.vue
index de51cb3a..854b85e9 100644
--- a/src/views/mobile/Login.vue
+++ b/src/views/mobile/Login.vue
@@ -53,8 +53,6 @@
 
         <f7-sheet
             style="height:auto; --f7-sheet-bg-color: #fff;"
-            backdrop
-            close-on-escape
             :opened="show2faSheet" @sheet:closed="show2faSheet = false"
         >
             <div class="sheet-modal-swipe-step">
diff --git a/src/views/mobile/users/TwoFactorAuth.vue b/src/views/mobile/users/TwoFactorAuth.vue
index 00efdaf5..27e33092 100644
--- a/src/views/mobile/users/TwoFactorAuth.vue
+++ b/src/views/mobile/users/TwoFactorAuth.vue
@@ -15,8 +15,6 @@
 
         <f7-sheet
             style="height:auto; --f7-sheet-bg-color: #fff;"
-            backdrop
-            close-on-escape
             :opened="showInputPasscodeSheetForEnable" @sheet:closed="showInputPasscodeSheetForEnable = false; currentPasscodeForEnable = ''"
         >
             <div class="sheet-modal-swipe-step">
@@ -48,8 +46,6 @@
 
         <f7-sheet
             style="height:auto; --f7-sheet-bg-color: #fff;"
-            backdrop
-            close-on-escape
             :opened="showInputPasswordSheetForDisable" @sheet:closed="showInputPasswordSheetForDisable = false; currentPasswordForDisable = ''"
         >
             <div class="sheet-modal-swipe-step">
@@ -78,8 +74,6 @@
 
         <f7-sheet
             style="height:auto; --f7-sheet-bg-color: #fff;"
-            backdrop
-            close-on-escape
             :opened="showInputPasswordSheetForRegenerate" @sheet:closed="showInputPasswordSheetForRegenerate = false; currentPasswordForRegenerate= ''"
         >
             <div class="sheet-modal-swipe-step">
@@ -108,8 +102,6 @@
 
         <f7-sheet
             style="height:auto; --f7-sheet-bg-color: #fff;"
-            backdrop
-            close-on-escape
             :opened="showBackupCodeSheet" @sheet:closed="showBackupCodeSheet = false; currentBackupCode = ''"
         >
             <div class="sheet-modal-swipe-step">
diff --git a/src/views/mobile/users/UserProfile.vue b/src/views/mobile/users/UserProfile.vue
index 8d8defa5..555a246a 100644
--- a/src/views/mobile/users/UserProfile.vue
+++ b/src/views/mobile/users/UserProfile.vue
@@ -45,8 +45,6 @@
 
         <f7-sheet
             style="height:auto; --f7-sheet-bg-color: #fff;"
-            backdrop
-            close-on-escape
             :opened="showInputPasswordSheet" @sheet:closed="showInputPasswordSheet = false"
         >
             <div class="sheet-modal-swipe-step">