diff --git a/src/mobile-main.js b/src/mobile-main.js
index ffae7fd8..101ccaad 100644
--- a/src/mobile-main.js
+++ b/src/mobile-main.js
@@ -128,8 +128,6 @@ new Vue({
             if (event.key === 'Escape' || event.key === 'Esc' || event.keyCode === 27 || event.which === 27) {
                 if (document.querySelectorAll('.modal-in').length > 0) {
                     app.dialog.close();
-                    app.sheet.close();
-                    app.popup.close();
                     return false;
                 }
             }
diff --git a/src/views/mobile/About.vue b/src/views/mobile/About.vue
index c8e3b15f..965da45d 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>
+        <f7-popup class="license-popup" swipe-to-close close-on-escape>
             <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 eedfcde0..75d29e36 100644
--- a/src/views/mobile/Login.vue
+++ b/src/views/mobile/Login.vue
@@ -52,9 +52,10 @@
         </f7-popover>
 
         <f7-sheet
-            id="2fa-auth-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">
                 <div class="display-flex padding justify-content-space-between align-items-center">
@@ -101,6 +102,7 @@ export default {
             passcode: '',
             backupCode: '',
             tempToken: '',
+            show2faSheet: false,
             twoFAVerifyType: 'passcode',
             twoFAVerifyTypeSwitchName: 'Use a backup code',
             allLanguages: self.$getAllLanguages()
@@ -151,7 +153,7 @@ export default {
             }
 
             if (self.tempToken) {
-                app.sheet.open('#2fa-auth-sheet');
+                self.show2faSheet = true;
                 return;
             }
 
@@ -178,7 +180,7 @@ export default {
 
                 if (data.result.need2FA) {
                     self.tempToken = data.result.token;
-                    app.sheet.open('#2fa-auth-sheet');
+                    self.show2faSheet = true;
                     return;
                 }
 
@@ -238,7 +240,7 @@ export default {
                 }
 
                 self.$user.updateToken(data.result);
-                app.sheet.close('#2fa-auth-sheet');
+                self.show2faSheet = false;
                 router.navigate('/');
             }).catch(error => {
                 app.preloader.hide();
diff --git a/src/views/mobile/users/UserProfile.vue b/src/views/mobile/users/UserProfile.vue
index 142e0465..8d8defa5 100644
--- a/src/views/mobile/users/UserProfile.vue
+++ b/src/views/mobile/users/UserProfile.vue
@@ -46,6 +46,7 @@
         <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">