diff --git a/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/FlatLookAndFeelManager.java b/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/FlatLookAndFeelManager.java
index 2993448829..b16b74aadf 100644
--- a/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/FlatLookAndFeelManager.java
+++ b/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/FlatLookAndFeelManager.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,5 +43,9 @@ public class FlatLookAndFeelManager extends LookAndFeelManager {
 		// if "Tree.showDefaultIcons" is false.  We want the tree to display folder icons.
 		//
 		UIManager.put("Tree.showDefaultIcons", Boolean.TRUE);
+
+		// This fixes a bug in FlatScrollPaneUI at line 189 (version 3.2.1).  This can be removed
+		// in a future update if that code is fixed.
+		UIManager.put("ScrollPane.smoothScrolling", Boolean.FALSE);
 	}
 }