diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
index c93091e3ac2..1d5bdb4938e 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java
@@ -365,6 +365,9 @@ public final class CEditorConstructed extends CDeckEditor<Deck> {
      * Switch between the main deck and the sideboard editor.
      */
     public void setEditorMode(DeckSection sectionMode) {
+        if (sectionMode == null) {
+            return;
+        }
         switch(this.gameType) {
             case Constructed:
                 switch(sectionMode) {