diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java
index be08e167ce..1651012472 100644
--- a/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java
+++ b/app/src/common/shared/com/igalia/wolvic/ui/widgets/NavigationBarWidget.java
@@ -369,9 +369,8 @@ private void updateUI() {
             }
             if (mAttachedWindow.getKeepFullscreenInHamburgerMenu()) {
                 postDelayed(() -> {
-                    mAttachedWindow.setIsFullScreen(true);
+                    mAttachedWindow.keepFullscreenInHamburgerMenu();
                 }, 2000);
-                mAttachedWindow.setKeepFullscreenInHamburgerMenu(false);
             }
             if (mAudio != null) {
                 mAudio.playSound(AudioEngine.Sound.CLICK);
@@ -800,6 +799,7 @@ private void exitFullScreenMode() {
             }
             if (mAttachedWindow.getKeepFullscreenInHamburgerMenu()) {
                 mAttachedWindow.setIsFullScreen(false);
+                mAttachedWindow.setFullscreenInHamburgerMenuEnabled(false);
                 mAttachedWindow.setKeepFullscreenInHamburgerMenu(false);
             }
         }, 50);
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java
index 756317d532..23f7e4e31c 100644
--- a/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java
+++ b/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java
@@ -971,6 +971,11 @@ public void setFullscreenInHamburgerMenu() {
         setFullscreenInHamburgerMenuEnabled(true);
     }
 
+    public void keepFullscreenInHamburgerMenu() {
+        setIsFullScreen(true);
+        setKeepFullscreenInHamburgerMenu(false);
+    }
+
     public void setIsFullScreen(boolean isFullScreen) {
         if (isFullScreen && fullscreenInHamburgerMenuEnabled) {
             keepFullscreenInHamburgerMenu = true;
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/Windows.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/Windows.java
index a1cf83d0a1..ad635a80b6 100644
--- a/app/src/common/shared/com/igalia/wolvic/ui/widgets/Windows.java
+++ b/app/src/common/shared/com/igalia/wolvic/ui/widgets/Windows.java
@@ -1773,9 +1773,8 @@ public void showTabAddedNotification() {
 
         if (mFocusedWindow.getKeepFullscreenInHamburgerMenu()) {
             mFocusedWindow.postDelayed(() -> {
-                mFocusedWindow.setIsFullScreen(true);
+                mFocusedWindow.keepFullscreenInHamburgerMenu();
             }, 2000);
-            mFocusedWindow.setKeepFullscreenInHamburgerMenu(false);
         }
     }