diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 6f162388c..c8908a729 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -46,6 +46,9 @@
 	<suppress checks="ClassFanOutComplexity"
 			  files="SearchRootItem.java"
 			  lines="0-9999"/>
+	<suppress checks="CyclomaticComplexity"
+			  files="SplitableTabPane.java"
+			  lines="0-9999"/>
 
 	<suppress checks="ClassFanOutComplexity"
 			  files="ContextBuilder.java"
diff --git a/checkstyle.xml b/checkstyle.xml
index aaf20c6fd..65088dbbf 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -188,7 +188,7 @@
 			<property name="excludedClasses" value="List, ArrayList, Deque, Queue, LinkedList, Set, HashSet, SortedSet, TreeSet, Map, HashMap, SortedMap, TreeMap"/>
 			<property name="excludedClasses" value="File, FileUtils, Path, Paths, URL"/>
 			<property name="excludedClasses" value="ActionMenu, ActionMenuItem, IconView"/>
-			<property name="excludedPackages" value="javafx.scene, javafx.scene.control, javafx.scene.layout, javafx.stage, javafx.application"/>
+			<property name="excludedPackages" value="javafx.scene, javafx.scene.control, javafx.scene.layout, javafx.stage, javafx.application, javafx.scene.input"/>
 			<!-- JavaParser is so overly-verbose with its types that its impossible to use it without flagging CFOC without a filter like this -->
 			<property name="excludedPackages" value="com.github.javaparser, com.github.javaparser.ast, com.github.javaparser.ast.body, com.github.javaparser.ast.type"/>
 			<property name="excludedPackages" value="com.github.javaparser.resolution, com.github.javaparser.resolution.declarations, com.github.javaparser.resolution.types"/>
diff --git a/src/main/java/me/coley/recaf/ui/controls/SplitableTabPane.java b/src/main/java/me/coley/recaf/ui/controls/SplitableTabPane.java
index 1afcb9857..13fbe15f9 100644
--- a/src/main/java/me/coley/recaf/ui/controls/SplitableTabPane.java
+++ b/src/main/java/me/coley/recaf/ui/controls/SplitableTabPane.java
@@ -47,24 +47,6 @@ public SplitableTabPane() {
 				dragEvent.consume();
 			}
 		});
-		setOnDragEntered(dragEvent -> {
-			Dragboard dragboard = dragEvent.getDragboard();
-			if (dragboard.hasString()
-					&& TAB_DRAG_KEY.equals(dragboard.getString())
-					&& draggedTab.get() != null
-					&& draggedTab.get().getTabPane() != selfPane) {
-				addStyle();
-			}
-		});
-		setOnDragExited(dragEvent -> {
-			Dragboard dragboard = dragEvent.getDragboard();
-			if (dragboard.hasString()
-					&& TAB_DRAG_KEY.equals(dragboard.getString())
-					&& draggedTab.get() != null
-					&& draggedTab.get().getTabPane() != selfPane) {
-				removeStyle();
-			}
-		});
 		// Setup start drag
 		setOnDragDetected(mouseEvent -> {
 			if (mouseEvent.getSource() instanceof TabPane) {
@@ -100,8 +82,7 @@ public SplitableTabPane() {
 			if (dragboard.hasString()
 					&& TAB_DRAG_KEY.equals(dragboard.getString())
 					&& dragged != null) {
-				if ( dragged.getTabPane() != selfPane)
-				{
+				if (dragged.getTabPane() != selfPane) {
 					SplitableTabPane owner = (SplitableTabPane) dragged.getTabPane();
 					owner.closeTab(dragged);
 					getTabs().add(dragged);
@@ -113,6 +94,25 @@ public SplitableTabPane() {
 				removeStyle();
 			}
 		});
+		// Highlighting with style classes
+		setOnDragEntered(dragEvent -> {
+			Dragboard dragboard = dragEvent.getDragboard();
+			if (dragboard.hasString()
+					&& TAB_DRAG_KEY.equals(dragboard.getString())
+					&& draggedTab.get() != null
+					&& draggedTab.get().getTabPane() != selfPane) {
+				addStyle();
+			}
+		});
+		setOnDragExited(dragEvent -> {
+			Dragboard dragboard = dragEvent.getDragboard();
+			if (dragboard.hasString()
+					&& TAB_DRAG_KEY.equals(dragboard.getString())
+					&& draggedTab.get() != null
+					&& draggedTab.get().getTabPane() != selfPane) {
+				removeStyle();
+			}
+		});
 	}
 
 	/**