diff --git a/src/ca/mcgill/cs/jetuml/gui/EditorFrame.java b/src/ca/mcgill/cs/jetuml/gui/EditorFrame.java
index 621905ba1..c5447b5c0 100644
--- a/src/ca/mcgill/cs/jetuml/gui/EditorFrame.java
+++ b/src/ca/mcgill/cs/jetuml/gui/EditorFrame.java
@@ -104,7 +104,7 @@ public EditorFrame(Stage pMainStage, Optional<File> pOpenWith)
 		setTop(menuBar);
 		
 		TabPane tabPane = new TabPane();
-		tabPane.setTabDragPolicy(TabPane.TabDragPolicy.REORDER);
+//		tabPane.setTabDragPolicy(TabPane.TabDragPolicy.REORDER); // This JavaFX feature is too buggy to use at the moment see issue #455
 		tabPane.getSelectionModel().selectedItemProperty().addListener((pValue, pOld, pNew) -> setMenuVisibility());
 		setCenter( tabPane );