diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 4e678e5a90c6660fbeaaa57962f65a10b25c9e9f..9055579db0a27653025786844e2777c80f6a4e6a 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -616,6 +616,8 @@ Rectangle {
         sequence: "F11"
         context: Qt.ApplicationShortcut
         onActivated: {
+            if (JamiQmlUtils.callIsFullscreen)
+                return
             if (containerWindow.visibility !== Window.FullScreen)
                 containerWindow.visibility = Window.FullScreen
             else
@@ -645,6 +647,15 @@ Rectangle {
         onActivated: startWizard()
     }
 
+    Shortcut {
+        sequence: "Escape"
+        context: Qt.ApplicationShortcut
+        onActivated: {
+            if (JamiQmlUtils.callIsFullscreen)
+                callStackView.toggleFullScreen()
+        }
+    }
+
     KeyBoardShortcutTable {
         id: shortcutsTable
     }
diff --git a/src/wizardview/components/CreateAccountPage.qml b/src/wizardview/components/CreateAccountPage.qml
index af6426f82dffec4960d4d12fac3ee7bbb8c0c827..e3151663c7400f7ae6112f771b04f4bd75157566 100644
--- a/src/wizardview/components/CreateAccountPage.qml
+++ b/src/wizardview/components/CreateAccountPage.qml
@@ -59,13 +59,6 @@ Rectangle {
 
     color: JamiTheme.backgroundColor
 
-    Shortcut {
-        context: Qt.ApplicationShortcut
-        sequence: "Esc"
-        enabled: !root.activeFocus
-        onActivated: leavePage()
-    }
-
     onVisibleChanged: {
         if (visible && createAccountStack.currentIndex === 0)
             usernameEdit.focus = true