diff --git a/src/main/java/edu/rpi/legup/controller/TreeController.java b/src/main/java/edu/rpi/legup/controller/TreeController.java
index b954edd79..9b884d61b 100644
--- a/src/main/java/edu/rpi/legup/controller/TreeController.java
+++ b/src/main/java/edu/rpi/legup/controller/TreeController.java
@@ -55,6 +55,7 @@ public void mouseReleased(MouseEvent e) {
         Puzzle puzzle = getInstance().getPuzzleModule();
         TreeViewSelection selection = treeView.getSelection();
         if (treeElementView != null) {
+            treeElementView.getTreeElement().getBoard().setModifiable(!treeElementView.getTreeElement().isContradictoryBranch());
             if (e.isShiftDown()) {
                 selection.addToSelection(treeElementView);
             }
diff --git a/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeView.java b/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeView.java
index b601aefc7..ecf59146d 100644
--- a/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeView.java
+++ b/src/main/java/edu/rpi/legup/ui/proofeditorui/treeview/TreeView.java
@@ -332,11 +332,6 @@ public void onTreeSelectionChanged(TreeViewSelection selection) {
         this.selection.getSelectedViews().forEach(v -> v.setSelected(false));
         selection.getSelectedViews().forEach(v -> v.setSelected(true));
         this.selection = selection;
-        // When selected node is on a contradictory branch, disable board modifiability
-        if(selection.getFirstSelection().getTreeElement().isContradictoryBranch()) {
-            GameBoardFacade.getInstance().getBoard().setModifiable(false);
-        }
-        else GameBoardFacade.getInstance().getBoard().setModifiable(true);
         repaint();
     }