diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java
index e4fd8d7077c..d6f5bb9a3d6 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java
@@ -196,10 +196,7 @@ public final class CEditorCommander extends ACEditorBase<PaperCard, Deck> {
      */
     @Override
     public boolean canSwitchAway(boolean isClosing) {
-        if (isClosing) {
-            return SEditorIO.confirmSaveChanges(FScreen.DECK_EDITOR_COMMANDER);
-        }
-        return true;
+        return SEditorIO.confirmSaveChanges(FScreen.DECK_EDITOR_COMMANDER);
     }
 
     /* (non-Javadoc)
diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java
index ff4158744b7..9fa34cbb5e4 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java
@@ -365,10 +365,7 @@ public final class CEditorConstructed extends ACEditorBase<PaperCard, Deck> {
      */
     @Override
     public boolean canSwitchAway(boolean isClosing) {
-        if (isClosing) {
-            return SEditorIO.confirmSaveChanges(FScreen.DECK_EDITOR_CONSTRUCTED);
-        }
-        return true;
+        return SEditorIO.confirmSaveChanges(FScreen.DECK_EDITOR_CONSTRUCTED);
     }
 
     /* (non-Javadoc)
diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java
index 468bdc96b81..8db90ff8e5c 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java
@@ -180,10 +180,7 @@ public final class CEditorLimited extends ACEditorBase<PaperCard, DeckGroup> {
      */
     @Override
     public boolean canSwitchAway(boolean isClosing) {
-        if (isClosing) {
-            return SEditorIO.confirmSaveChanges(getScreen());
-        }
-        return true;
+        return SEditorIO.confirmSaveChanges(getScreen());
     }
 
     /* (non-Javadoc)
diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java
index 58cb2e75b32..b75b9f136b9 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java
@@ -296,14 +296,11 @@ public final class CEditorQuest extends ACEditorBase<PaperCard, Deck> {
      */
     @Override
     public boolean canSwitchAway(boolean isClosing) {
-        if (isClosing) {
-            if (SEditorIO.confirmSaveChanges(FScreen.DECK_EDITOR_QUEST)) {
-                Singletons.getModel().getQuest().save();
-                return true;
-            }
-            return false;
+        if (SEditorIO.confirmSaveChanges(FScreen.DECK_EDITOR_QUEST)) {
+            Singletons.getModel().getQuest().save();
+            return true;
         }
-        return true;
+        return false;
     }
 
     /* (non-Javadoc)
diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java
index 006ace4cd52..eedfcc2b421 100644
--- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java
+++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java
@@ -178,10 +178,7 @@ public final class CEditorVariant extends ACEditorBase<PaperCard, Deck> {
      */
     @Override
     public boolean canSwitchAway(boolean isClosing) {
-        if (isClosing) {
-            return SEditorIO.confirmSaveChanges(getScreen());
-        }
-        return true;
+        return SEditorIO.confirmSaveChanges(getScreen());
     }
 
     /* (non-Javadoc)