diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef5a8b1a8..65f473a73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased] - 2021-02-27
 ### Fixed
 - #1623 Right side marker (gray line) in P-code
+- #1622 Slow scrolling (search results, advanced settings and others)
 
 ## [14.0.1] - 2021-02-26
 ### Added
diff --git a/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java b/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java
index c1069e8f0..cbc408892 100644
--- a/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/AdvancedSettingsDialog.java
@@ -172,7 +172,7 @@ public class AdvancedSettingsDialog extends AppDialog {
 
         Container cnt = getContentPane();
         cnt.setLayout(new BorderLayout());
-        //cnt.add(new JScrollPane(configurationTable),BorderLayout.CENTER);
+        //cnt.add(new FasterScrollPane(configurationTable),BorderLayout.CENTER);
 
         JPanel buttonsPanel = new JPanel(new BorderLayout());
 
@@ -487,7 +487,7 @@ public class AdvancedSettingsDialog extends AppDialog {
                 p.add(tipPanel, BorderLayout.SOUTH);
                 configPanel = p;
             }
-            tabs.put(cat, new JScrollPane(configPanel));
+            tabs.put(cat, new FasterScrollPane(configPanel));
         }
     }
 
diff --git a/src/com/jpexs/decompiler/flash/gui/BinaryPanel.java b/src/com/jpexs/decompiler/flash/gui/BinaryPanel.java
index f41d928df..976f5423a 100644
--- a/src/com/jpexs/decompiler/flash/gui/BinaryPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/BinaryPanel.java
@@ -50,7 +50,7 @@ public final class BinaryPanel extends JPanel {
         super(new BorderLayout());
         this.mainPanel = mainPanel;
 
-        add(new JScrollPane(hexEditor), BorderLayout.CENTER);
+        add(new FasterScrollPane(hexEditor), BorderLayout.CENTER);
 
         JPanel bottomPanel = new JPanel(new BorderLayout());
         JPanel buttonsPanel = new JPanel(new FlowLayout());
diff --git a/src/com/jpexs/decompiler/flash/gui/DebugLogDialog.java b/src/com/jpexs/decompiler/flash/gui/DebugLogDialog.java
index 760e35028..596c7ed6e 100644
--- a/src/com/jpexs/decompiler/flash/gui/DebugLogDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/DebugLogDialog.java
@@ -47,7 +47,7 @@ public class DebugLogDialog extends AppDialog {
         setTitle(translate("dialog.title"));
         logTextArea.setBackground(Color.white);
         logTextArea.setEditable(false);
-        JScrollPane spane = new JScrollPane(logTextArea);
+        JScrollPane spane = new FasterScrollPane(logTextArea);
         spane.setPreferredSize(new Dimension(800, 500));
 
         debug.addMessageListener(new DebugListener() {
diff --git a/src/com/jpexs/decompiler/flash/gui/DebugPanel.java b/src/com/jpexs/decompiler/flash/gui/DebugPanel.java
index a60b80951..2348d9159 100644
--- a/src/com/jpexs/decompiler/flash/gui/DebugPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/DebugPanel.java
@@ -476,14 +476,14 @@ public class DebugPanel extends JPanel {
                     if (debugRegistersTable.getRowCount() > 0) {
                         tabTypes.add(SelectedTab.REGISTERS);
                         pa = new JPanel(new BorderLayout());
-                        pa.add(new JScrollPane(debugRegistersTable), BorderLayout.CENTER);
+                        pa.add(new FasterScrollPane(debugRegistersTable), BorderLayout.CENTER);
                         varTabs.addTab(AppStrings.translate("variables.header.registers"), pa);
                     }
                     if (debugLocalsTable.getRowCount() > 0) {
                         tabTypes.add(SelectedTab.LOCALS);
 
                         pa = new JPanel(new BorderLayout());
-                        pa.add(new JScrollPane(debugLocalsTable), BorderLayout.CENTER);
+                        pa.add(new FasterScrollPane(debugLocalsTable), BorderLayout.CENTER);
                         varTabs.addTab(AppStrings.translate("variables.header.locals"), pa);
                     }
 
@@ -491,7 +491,7 @@ public class DebugPanel extends JPanel {
                         tabTypes.add(SelectedTab.SCOPECHAIN);
 
                         pa = new JPanel(new BorderLayout());
-                        pa.add(new JScrollPane(debugScopeTable), BorderLayout.CENTER);
+                        pa.add(new FasterScrollPane(debugScopeTable), BorderLayout.CENTER);
                         varTabs.addTab(AppStrings.translate("variables.header.scopeChain"), pa);
                     }
 
@@ -499,7 +499,7 @@ public class DebugPanel extends JPanel {
                         tabTypes.add(SelectedTab.CONSTANTPOOL);
 
                         pa = new JPanel(new BorderLayout());
-                        pa.add(new JScrollPane(constantPoolTable), BorderLayout.CENTER);
+                        pa.add(new FasterScrollPane(constantPoolTable), BorderLayout.CENTER);
                         varTabs.addTab(AppStrings.translate("constantpool.header"), pa);
                     }
 
@@ -507,21 +507,21 @@ public class DebugPanel extends JPanel {
                         tabTypes.add(SelectedTab.CALLSTACK);
 
                         pa = new JPanel(new BorderLayout());
-                        pa.add(new JScrollPane(callStackTable), BorderLayout.CENTER);
+                        pa.add(new FasterScrollPane(callStackTable), BorderLayout.CENTER);
                         varTabs.addTab(AppStrings.translate("callStack.header"), pa);
                     }
                     if (stackTable.getRowCount() > 0) {
                         tabTypes.add(SelectedTab.STACK);
 
                         pa = new JPanel(new BorderLayout());
-                        pa.add(new JScrollPane(stackTable), BorderLayout.CENTER);
+                        pa.add(new FasterScrollPane(stackTable), BorderLayout.CENTER);
                         varTabs.addTab(AppStrings.translate("stack.header"), pa);
                     }
                     if (logLength > 0) {
                         tabTypes.add(SelectedTab.LOG);
 
                         pa = new JPanel(new BorderLayout());
-                        pa.add(new JScrollPane(traceLogTextarea), BorderLayout.CENTER);
+                        pa.add(new FasterScrollPane(traceLogTextarea), BorderLayout.CENTER);
                         JButton clearButton = new JButton(AppStrings.translate("debuglog.button.clear"));
                         clearButton.addActionListener(new ActionListener() {
 
diff --git a/src/com/jpexs/decompiler/flash/gui/DocsPanel.java b/src/com/jpexs/decompiler/flash/gui/DocsPanel.java
index 27a5a00df..ee58f6f37 100644
--- a/src/com/jpexs/decompiler/flash/gui/DocsPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/DocsPanel.java
@@ -35,7 +35,7 @@ public class DocsPanel extends JPanel implements DocsListener {
 
     public DocsPanel() {
         setLayout(new BorderLayout(0, 0));
-        JScrollPane sp = new JScrollPane(textDisplay);
+        JScrollPane sp = new FasterScrollPane(textDisplay);
 
         textDisplay.setMargin(new Insets(0, 0, 0, 0));
         add(sp, BorderLayout.CENTER);
diff --git a/src/com/jpexs/decompiler/flash/gui/ErrorLogFrame.java b/src/com/jpexs/decompiler/flash/gui/ErrorLogFrame.java
index 776097121..73e8ebe44 100644
--- a/src/com/jpexs/decompiler/flash/gui/ErrorLogFrame.java
+++ b/src/com/jpexs/decompiler/flash/gui/ErrorLogFrame.java
@@ -138,7 +138,7 @@ public class ErrorLogFrame extends AppFrame {
         collapseIcon = View.getIcon("collapse16");
         cnt.add(buttonsPanel, BorderLayout.SOUTH);
 
-        cnt.add(new JScrollPane(logView), BorderLayout.CENTER);
+        cnt.add(new FasterScrollPane(logView), BorderLayout.CENTER);
         handler = new Handler() {
             SimpleFormatter formatter = new SimpleFormatter();
 
@@ -257,7 +257,7 @@ public class ErrorLogFrame extends AppFrame {
 
                 final JScrollPane scrollPane;
                 if (detailComponent != null) {
-                    scrollPane = new JScrollPane(detailComponent);
+                    scrollPane = new FasterScrollPane(detailComponent);
                     scrollPane.setAlignmentX(0f);
                 } else {
                     scrollPane = null;
diff --git a/src/com/jpexs/decompiler/flash/gui/FasterScrollPane.java b/src/com/jpexs/decompiler/flash/gui/FasterScrollPane.java
new file mode 100644
index 000000000..5dffbfbf8
--- /dev/null
+++ b/src/com/jpexs/decompiler/flash/gui/FasterScrollPane.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 JPEXS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.jpexs.decompiler.flash.gui;
+
+import java.awt.Component;
+import javax.swing.JScrollPane;
+
+/**
+ *
+ * @author JPEXS
+ */
+public class FasterScrollPane extends JScrollPane {
+
+    public FasterScrollPane(Component view) {
+        super(view);
+        initSpeed();
+    }
+
+    public FasterScrollPane() {
+        super();
+        initSpeed();
+    }
+
+    public FasterScrollPane(int vsbPolicy, int hsbPolicy) {
+        super(vsbPolicy, hsbPolicy);
+        initSpeed();
+    }
+
+    public FasterScrollPane(Component view, int vsbPolicy, int hsbPolicy) {
+        super(view, vsbPolicy, hsbPolicy);
+        initSpeed();
+    }
+
+    private void initSpeed() {
+        getVerticalScrollBar().setUnitIncrement(20);
+    }
+
+}
diff --git a/src/com/jpexs/decompiler/flash/gui/FilesChangedDialog.java b/src/com/jpexs/decompiler/flash/gui/FilesChangedDialog.java
index a04ed31d9..a224ad817 100644
--- a/src/com/jpexs/decompiler/flash/gui/FilesChangedDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/FilesChangedDialog.java
@@ -78,7 +78,7 @@ public class FilesChangedDialog extends AppDialog {
         cnt.add(label, BorderLayout.NORTH);
         filesList = new JList<String>(listModel);
         filesList.setBackground(Color.white);
-        cnt.add(new JScrollPane(filesList), BorderLayout.CENTER);
+        cnt.add(new FasterScrollPane(filesList), BorderLayout.CENTER);
 
         JPanel panButtons = new JPanel(new FlowLayout());
         okButton.addActionListener(this::okButtonActionPerformed);
diff --git a/src/com/jpexs/decompiler/flash/gui/FontEmbedDialog.java b/src/com/jpexs/decompiler/flash/gui/FontEmbedDialog.java
index 5a684b404..af7e1a60e 100644
--- a/src/com/jpexs/decompiler/flash/gui/FontEmbedDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/FontEmbedDialog.java
@@ -234,7 +234,7 @@ public class FontEmbedDialog extends AppDialog {
             rangeRowPanel.setAlignmentX(0);
             rangesPanel.add(rangeRowPanel);
         }
-        cnt.add(new JScrollPane(rangesPanel));
+        cnt.add(new FasterScrollPane(rangesPanel));
 
         JPanel specialPanel = new JPanel();
         specialPanel.setLayout(new BoxLayout(specialPanel, BoxLayout.X_AXIS));
diff --git a/src/com/jpexs/decompiler/flash/gui/FontPanel.java b/src/com/jpexs/decompiler/flash/gui/FontPanel.java
index 93344a35c..04d4a9f53 100644
--- a/src/com/jpexs/decompiler/flash/gui/FontPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/FontPanel.java
@@ -245,14 +245,14 @@ public class FontPanel extends JPanel {
 
     private void initComponents() {
 
-        contentScrollPane = new JScrollPane();
+        contentScrollPane = new FasterScrollPane();
         addCharsPanel = new JPanel();
         fontParamsPanel = new JPanel();
         fontNameIntagLabel = new JLabel();
-        JScrollPane fontDisplayNameScrollPane = new JScrollPane();
+        JScrollPane fontDisplayNameScrollPane = new FasterScrollPane();
         fontNameTextArea = new JTextArea();
         JLabel jLabel3 = new JLabel();
-        JScrollPane fontCopyrightScrollPane = new JScrollPane();
+        JScrollPane fontCopyrightScrollPane = new FasterScrollPane();
         fontCopyrightTextArea = new JTextArea();
         JLabel jLabel4 = new JLabel();
         fontIsBoldCheckBox = new JCheckBox();
@@ -265,7 +265,7 @@ public class FontPanel extends JPanel {
         JLabel jLabel8 = new JLabel();
         fontLeadingLabel = new JLabel();
         JLabel jLabel9 = new JLabel();
-        fontCharactersScrollPane = new JScrollPane();
+        fontCharactersScrollPane = new FasterScrollPane();
         fontCharactersTextArea = new JTextArea();
         JLabel fontCharsAddLabel = new JLabel();
         fontAddCharactersField = new JTextField();
diff --git a/src/com/jpexs/decompiler/flash/gui/GenericTagPanel.java b/src/com/jpexs/decompiler/flash/gui/GenericTagPanel.java
index 131e5d279..fddb8795c 100644
--- a/src/com/jpexs/decompiler/flash/gui/GenericTagPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/GenericTagPanel.java
@@ -121,14 +121,14 @@ public class GenericTagPanel extends JPanel implements ChangeListener {
             }
         };
         genericTagPropertiesEditorPane.setEditable(false);
-        genericTagPropertiesEditorPaneScrollPanel = new JScrollPane(genericTagPropertiesEditorPane);
+        genericTagPropertiesEditorPaneScrollPanel = new FasterScrollPane(genericTagPropertiesEditorPane);
         add(genericTagPropertiesEditorPaneScrollPanel, BorderLayout.CENTER);
 
         genericTagPropertiesEditPanel = new JPanel();
         genericTagPropertiesEditPanel.setLayout(new SpringLayout());
         JPanel edPanel = new JPanel(new BorderLayout());
         edPanel.add(genericTagPropertiesEditPanel, BorderLayout.NORTH);
-        genericTagPropertiesEditPanelScrollPanel = new JScrollPane(edPanel);
+        genericTagPropertiesEditPanelScrollPanel = new FasterScrollPane(edPanel);
     }
 
     public void clear() {
diff --git a/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java b/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java
index 31a400aa2..e11d9377f 100644
--- a/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/GenericTagTreePanel.java
@@ -301,7 +301,7 @@ public class GenericTagTreePanel extends GenericTagPanel {
         setLayout(new BorderLayout());
         tree = new MyTree();
 
-        add(new JScrollPane(tree), BorderLayout.CENTER);
+        add(new FasterScrollPane(tree), BorderLayout.CENTER);
         tree.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {
diff --git a/src/com/jpexs/decompiler/flash/gui/GraphDialog.java b/src/com/jpexs/decompiler/flash/gui/GraphDialog.java
index 1140d1ea1..d2aec9bc2 100644
--- a/src/com/jpexs/decompiler/flash/gui/GraphDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/GraphDialog.java
@@ -117,8 +117,7 @@ public class GraphDialog extends AppDialog {
         });
 
         setTitle(translate("graph") + " " + name);
-        JScrollPane scrollPane = new JScrollPane(gp);
-        scrollPane.getVerticalScrollBar().setUnitIncrement(20);
+        JScrollPane scrollPane = new FasterScrollPane(gp);
         scrollBarWidth = scrollPane.getVerticalScrollBar().getPreferredSize().width;
         scrollBarHeight = scrollPane.getHorizontalScrollBar().getPreferredSize().height;
         cnt.add(scrollPane, BorderLayout.CENTER);
diff --git a/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java b/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java
index 3074bdc89..7050d90bc 100644
--- a/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java
+++ b/src/com/jpexs/decompiler/flash/gui/LoadFromCacheFrame.java
@@ -105,7 +105,7 @@ public class LoadFromCacheFrame extends AppFrame {
         });
         cnt.setLayout(new BorderLayout());
         cnt.add(searchField, BorderLayout.NORTH);
-        cnt.add(new JScrollPane(list), BorderLayout.CENTER);
+        cnt.add(new FasterScrollPane(list), BorderLayout.CENTER);
 
         JPanel bottomPanel = new JPanel();
         bottomPanel.setLayout(new BoxLayout(bottomPanel, BoxLayout.Y_AXIS));
diff --git a/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java b/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java
index 84d241ba3..223a465f2 100644
--- a/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java
+++ b/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java
@@ -319,7 +319,7 @@ public class LoadFromMemoryFrame extends AppFrame {
         cnt.setLayout(new BorderLayout());
 
         JPanel leftPanel = new JPanel(new BorderLayout());
-        leftPanel.add(new JScrollPane(list), BorderLayout.CENTER);
+        leftPanel.add(new FasterScrollPane(list), BorderLayout.CENTER);
         JPanel leftButtonsPanel = new JPanel(new FlowLayout());
         JButton selectButton = new JButton(translate("button.select"));
         selectButton.addActionListener(this::selectProcessButtonActionPerformed);
@@ -330,7 +330,7 @@ public class LoadFromMemoryFrame extends AppFrame {
         leftPanel.add(leftButtonsPanel, BorderLayout.SOUTH);
 
         JPanel rightPanel = new JPanel(new BorderLayout());
-        rightPanel.add(new JScrollPane(tableRes), BorderLayout.CENTER);
+        rightPanel.add(new FasterScrollPane(tableRes), BorderLayout.CENTER);
         JPanel rightButtonsPanel = new JPanel(new FlowLayout());
         JButton openButton = new JButton(translate("button.open"));
         openButton.addActionListener(this::openSwfButtonActionPerformed);
diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index 10abd2607..96f1587c5 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -429,9 +429,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
     private JPanel createFolderPreviewCard() {
         JPanel folderPreviewCard = new JPanel(new BorderLayout());
         folderPreviewPanel = new FolderPreviewPanel(this, new ArrayList<>());
-        final JScrollPane jScrollPane = new JScrollPane(folderPreviewPanel);
-        jScrollPane.getVerticalScrollBar().setUnitIncrement(20);
-        folderPreviewCard.add(jScrollPane, BorderLayout.CENTER);
+        folderPreviewCard.add(new FasterScrollPane(folderPreviewPanel), BorderLayout.CENTER);
 
         return folderPreviewCard;
     }
@@ -439,7 +437,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
     private JPanel createDumpPreviewCard() {
         JPanel dumpViewCard = new JPanel(new BorderLayout());
         dumpViewPanel = new DumpViewPanel(dumpTree);
-        dumpViewCard.add(new JScrollPane(dumpViewPanel), BorderLayout.CENTER);
+        dumpViewCard.add(new FasterScrollPane(dumpViewPanel), BorderLayout.CENTER);
 
         return dumpViewCard;
     }
@@ -3306,13 +3304,13 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se
 
     private JPanel createDumpViewCard() {
         JPanel r = new JPanel(new BorderLayout());
-        r.add(new JPersistentSplitPane(JSplitPane.VERTICAL_SPLIT, new JScrollPane(dumpTree), dumpPreviewPanel, Configuration.guiDumpSplitPaneDividerLocationPercent), BorderLayout.CENTER);
+        r.add(new JPersistentSplitPane(JSplitPane.VERTICAL_SPLIT, new FasterScrollPane(dumpTree), dumpPreviewPanel, Configuration.guiDumpSplitPaneDividerLocationPercent), BorderLayout.CENTER);
         return r;
     }
 
     private JPanel createResourcesViewCard() {
         JPanel r = new JPanel(new BorderLayout());
-        r.add(new JScrollPane(tagTree), BorderLayout.CENTER);
+        r.add(new FasterScrollPane(tagTree), BorderLayout.CENTER);
         r.add(searchPanel, BorderLayout.SOUTH);
         return r;
     }
diff --git a/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java b/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
index 143528451..eeb51f0d2 100644
--- a/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/PreviewPanel.java
@@ -352,7 +352,7 @@ public class PreviewPanel extends JPersistentSplitPane implements TagEditorPanel
     private JPanel createMetadataCard() {
         JPanel metadataCard = new JPanel(new BorderLayout());
         metadataEditor = new LineMarkedEditorPane();
-        metadataCard.add(new JScrollPane(metadataEditor), BorderLayout.CENTER);
+        metadataCard.add(new FasterScrollPane(metadataEditor), BorderLayout.CENTER);
         //metadataEditor.setContentType("text/xml");
         metadataEditor.setEditable(false);
 
diff --git a/src/com/jpexs/decompiler/flash/gui/SearchResultsDialog.java b/src/com/jpexs/decompiler/flash/gui/SearchResultsDialog.java
index 0656c29da..7d51d586b 100644
--- a/src/com/jpexs/decompiler/flash/gui/SearchResultsDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/SearchResultsDialog.java
@@ -306,7 +306,7 @@ public class SearchResultsDialog<E extends SearchResult> extends AppDialog {
         resultsPanel.add(resultsTree, "tree");
         resultsPanel.add(resultsList, "list");
 
-        JScrollPane sp = new JScrollPane(resultsPanel);
+        JScrollPane sp = new FasterScrollPane(resultsPanel);
         sp.setPreferredSize(new Dimension(300, 300));
         cnt.add(sp, BorderLayout.CENTER);
 
diff --git a/src/com/jpexs/decompiler/flash/gui/TagInfoPanel.java b/src/com/jpexs/decompiler/flash/gui/TagInfoPanel.java
index ad8378136..b557ec227 100644
--- a/src/com/jpexs/decompiler/flash/gui/TagInfoPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/TagInfoPanel.java
@@ -54,7 +54,7 @@ public class TagInfoPanel extends JPanel {
         setLayout(new BorderLayout());
         JLabel topLabel = new JLabel(AppStrings.translate("taginfo.header"), JLabel.CENTER);
         add(topLabel, BorderLayout.NORTH);
-        add(new JScrollPane(editorPane), BorderLayout.CENTER);
+        add(new FasterScrollPane(editorPane), BorderLayout.CENTER);
 
         editorPane.setContentType("text/html");
         editorPane.setEditable(false);
diff --git a/src/com/jpexs/decompiler/flash/gui/TextPanel.java b/src/com/jpexs/decompiler/flash/gui/TextPanel.java
index c3c96802e..92580699c 100644
--- a/src/com/jpexs/decompiler/flash/gui/TextPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/TextPanel.java
@@ -99,7 +99,7 @@ public class TextPanel extends JPanel implements TagEditorPanel {
         topPanel.setLayout(new BoxLayout(topPanel, BoxLayout.Y_AXIS));
         topPanel.add(textSearchPanel);
         textValue = new LineMarkedEditorPane();
-        add(new JScrollPane(textValue), BorderLayout.CENTER);
+        add(new FasterScrollPane(textValue), BorderLayout.CENTER);
         textValue.setFont(Configuration.getSourceFont());
         textValue.changeContentType("text/swftext");
         textValue.addTextChangedListener(this::textChanged);
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index dae7f6a79..bcf3241a7 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -50,6 +50,7 @@ import com.jpexs.decompiler.flash.gui.AppDialog;
 import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.DebugPanel;
 import com.jpexs.decompiler.flash.gui.DebuggerHandler;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.gui.HeaderLabel;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.MainPanel;
@@ -911,7 +912,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
         brokenHintPanel.setBackground(new Color(253, 205, 137));
         brokenHintPanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createBevelBorder(BevelBorder.RAISED), new EmptyBorder(5, 5, 5, 5)));
 
-        decompiledScrollPane = new JScrollPane(decompiledTextArea);
+        decompiledScrollPane = new FasterScrollPane(decompiledTextArea);
 
         JPanel iconDecPanel = new JPanel();
         iconDecPanel.setLayout(new BoxLayout(iconDecPanel, BoxLayout.Y_AXIS));
@@ -1034,7 +1035,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
         sortButton.setMargin(new Insets(3, 3, 3, 3));
         navIconsPanel.add(sortButton);
         navPanel.add(navIconsPanel, BorderLayout.SOUTH);
-        navPanel.add(new JScrollPane(navigator), BorderLayout.CENTER);
+        navPanel.add(new FasterScrollPane(navigator), BorderLayout.CENTER);
         sortButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -1078,7 +1079,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<Scr
         });
         constantTypeList.addItemListener(this);
         panConstants.add(constantTypeList, BorderLayout.NORTH);
-        panConstants.add(new JScrollPane(constantTable), BorderLayout.CENTER);
+        panConstants.add(new FasterScrollPane(constantTable), BorderLayout.CENTER);
         tabbedPane.addTab(AppStrings.translate("constants"), panConstants);
     }
 
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/MethodCodePanel.java b/src/com/jpexs/decompiler/flash/gui/abc/MethodCodePanel.java
index d9b607c49..2a78ccfd5 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/MethodCodePanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/MethodCodePanel.java
@@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.DocsPanel;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.gui.controls.JPersistentSplitPane;
@@ -119,9 +120,9 @@ public class MethodCodePanel extends JPanel {
         docsPanel = new DocsPanel();
         sourceTextArea.addDocsListener(docsPanel);
         if (Configuration.displayAs3PCodeDocsPanel.get()) {
-            add(new JPersistentSplitPane(JSplitPane.VERTICAL_SPLIT, new JScrollPane(sourceTextArea), new JScrollPane(docsPanel), Configuration.guiAvm2DocsSplitPaneDividerLocationPercent));
+            add(new JPersistentSplitPane(JSplitPane.VERTICAL_SPLIT, new FasterScrollPane(sourceTextArea), new FasterScrollPane(docsPanel), Configuration.guiAvm2DocsSplitPaneDividerLocationPercent));
         } else {
-            add(new JScrollPane(sourceTextArea));
+            add(new FasterScrollPane(sourceTextArea));
         }
         sourceTextArea.changeContentType("text/flasm3");
         sourceTextArea.setFont(Configuration.getSourceFont());
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
index 983c850e4..9f3e34c34 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/SlotConstTraitDetailPanel.java
@@ -22,6 +22,7 @@ import com.jpexs.decompiler.flash.abc.avm2.parser.pcode.ASM3Parser;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.gui.AppStrings;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.gui.editor.LineMarkedEditorPane;
 import com.jpexs.decompiler.flash.helpers.HighlightedTextWriter;
@@ -60,7 +61,7 @@ public class SlotConstTraitDetailPanel extends JPanel implements TraitDetail {
     public SlotConstTraitDetailPanel(final DecompiledEditorPane editor) {
         slotConstEditor = new LineMarkedEditorPane();
         setLayout(new BorderLayout());
-        add(new JScrollPane(slotConstEditor), BorderLayout.CENTER);
+        add(new FasterScrollPane(slotConstEditor), BorderLayout.CENTER);
         slotConstEditor.setFont(Configuration.getSourceFont());
         slotConstEditor.changeContentType("text/flasm3");
         slotConstEditor.addCaretListener(new CaretListener() {
diff --git a/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java b/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java
index 901061d05..34d6f1896 100644
--- a/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java
+++ b/src/com/jpexs/decompiler/flash/gui/abc/UsageFrame.java
@@ -24,6 +24,7 @@ import com.jpexs.decompiler.flash.abc.usages.MethodMultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.MultinameUsage;
 import com.jpexs.decompiler.flash.abc.usages.TraitMultinameUsage;
 import com.jpexs.decompiler.flash.gui.AppDialog;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
 import java.awt.BorderLayout;
@@ -89,7 +90,7 @@ public class UsageFrame extends AppDialog implements MouseListener {
         usageList.addMouseListener(this);
         Container cont = getContentPane();
         cont.setLayout(new BorderLayout());
-        cont.add(new JScrollPane(usageList), BorderLayout.CENTER);
+        cont.add(new FasterScrollPane(usageList), BorderLayout.CENTER);
         cont.add(buttonsPanel, BorderLayout.SOUTH);
         setSize(400, 300);
         setTitle((definitions ? translate("dialog.title.declaration") : translate("dialog.title")) + abc.constants.getMultiname(multinameIndex).getNameWithNamespace(abc.constants, true).toPrintableString(true));
diff --git a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
index 12ac48fdf..b674f18d4 100644
--- a/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/action/ActionPanel.java
@@ -36,6 +36,7 @@ import com.jpexs.decompiler.flash.exporters.modes.ScriptExportMode;
 import com.jpexs.decompiler.flash.gui.AppStrings;
 import com.jpexs.decompiler.flash.gui.DebugPanel;
 import com.jpexs.decompiler.flash.gui.DebuggerHandler;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.gui.GraphDialog;
 import com.jpexs.decompiler.flash.gui.HeaderLabel;
 import com.jpexs.decompiler.flash.gui.Main;
@@ -728,7 +729,7 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
         }
 
         JPanel panCode = new JPanel(new BorderLayout());
-        panCode.add(new JScrollPane(editor), BorderLayout.CENTER);
+        panCode.add(new FasterScrollPane(editor), BorderLayout.CENTER);
         panCode.add(topButtonsPan, BorderLayout.NORTH);
 
         JPanel panB = new JPanel();
@@ -787,7 +788,7 @@ public class ActionPanel extends JPanel implements SearchListener<ScriptSearchRe
         brokenHintPanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createBevelBorder(BevelBorder.RAISED), new EmptyBorder(5, 5, 5, 5)));
 
         panelWithHint.add(brokenHintPanel, BorderLayout.NORTH);
-        panelWithHint.add(new JScrollPane(decompiledEditor), BorderLayout.CENTER);
+        panelWithHint.add(new FasterScrollPane(decompiledEditor), BorderLayout.CENTER);
 
         brokenHintPanel.setVisible(false);
 
diff --git a/src/com/jpexs/decompiler/flash/gui/action/AddScriptDialog.java b/src/com/jpexs/decompiler/flash/gui/action/AddScriptDialog.java
index 665c7e39f..eeba38c57 100644
--- a/src/com/jpexs/decompiler/flash/gui/action/AddScriptDialog.java
+++ b/src/com/jpexs/decompiler/flash/gui/action/AddScriptDialog.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.gui.action;
 import com.jpexs.decompiler.flash.ReadOnlyTagList;
 import com.jpexs.decompiler.flash.SWF;
 import com.jpexs.decompiler.flash.gui.AppDialog;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.MainPanel;
 import com.jpexs.decompiler.flash.gui.PreviewPanel;
@@ -263,7 +264,7 @@ public class AddScriptDialog extends AppDialog {
         framePreviewPanel.showEmpty();
 
         JPanel framePanel = new JPanel(new BorderLayout());
-        JScrollPane frameListScrollPane = new JScrollPane(frameList);
+        JScrollPane frameListScrollPane = new FasterScrollPane(frameList);
         frameListScrollPane.setMinimumSize(new Dimension(400, 1));
         JSplitPane frameSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, frameListScrollPane, framePreviewPanel);
         frameSplitPane.setDividerLocation(400);
@@ -346,7 +347,7 @@ public class AddScriptDialog extends AppDialog {
 
         spriteInitList.addListSelectionListener(this::spriteInitValueChanged);
 
-        JScrollPane spriteInitListScrollPane = new JScrollPane(spriteInitList);
+        JScrollPane spriteInitListScrollPane = new FasterScrollPane(spriteInitList);
         //spriteTreeScrollPane.setMinimumSize(new Dimension(400, 1));
         JSplitPane spriteInitSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, spriteInitListScrollPane, spriteInitPreviewPanel);
         spriteInitSplitPane.setDividerLocation(400);
@@ -431,7 +432,7 @@ public class AddScriptDialog extends AppDialog {
         spriteFramePreviewPanel.showEmpty();
         spriteFramePreviewPanel.setParametersPanelVisible(false);
 
-        JScrollPane spriteFrameTreeScrollPane = new JScrollPane(spriteFrameTree);
+        JScrollPane spriteFrameTreeScrollPane = new FasterScrollPane(spriteFrameTree);
         //spriteTreeScrollPane.setMinimumSize(new Dimension(400, 1));
         JSplitPane spriteFrameSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, spriteFrameTreeScrollPane, spriteFramePreviewPanel);
         spriteFrameSplitPane.setDividerLocation(400);
@@ -468,7 +469,7 @@ public class AddScriptDialog extends AppDialog {
         buttonPreviewPanel.showEmpty();
 
         JPanel buttonPanel = new JPanel(new BorderLayout());
-        JScrollPane buttonListScrollPane = new JScrollPane(buttonList);
+        JScrollPane buttonListScrollPane = new FasterScrollPane(buttonList);
         buttonListScrollPane.setMinimumSize(new Dimension(400, 1));
         JSplitPane buttonSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, buttonListScrollPane, buttonPreviewPanel);
         buttonSplitPane.setDividerLocation(400);
@@ -654,7 +655,7 @@ public class AddScriptDialog extends AppDialog {
         instancePreviewPanel.setParametersPanelVisible(false);
 
         JPanel instancePanel = new JPanel(new BorderLayout());
-        JScrollPane instanceTreeScrollPane = new JScrollPane(instanceTree);
+        JScrollPane instanceTreeScrollPane = new FasterScrollPane(instanceTree);
         instanceTreeScrollPane.setMinimumSize(new Dimension(400, 1));
         JSplitPane instanceSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, instanceTreeScrollPane, instancePreviewPanel);
         instanceSplitPane.setDividerLocation(400);
diff --git a/src/com/jpexs/decompiler/flash/gui/dumpview/DumpViewPanel.java b/src/com/jpexs/decompiler/flash/gui/dumpview/DumpViewPanel.java
index 515b592ba..6c20a51d6 100644
--- a/src/com/jpexs/decompiler/flash/gui/dumpview/DumpViewPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/dumpview/DumpViewPanel.java
@@ -18,6 +18,7 @@ package com.jpexs.decompiler.flash.gui.dumpview;
 
 import com.jpexs.decompiler.flash.dumpview.DumpInfo;
 import com.jpexs.decompiler.flash.dumpview.DumpInfoSwfNode;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.gui.MyTextField;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.gui.hexview.HexView;
@@ -196,7 +197,7 @@ public class DumpViewPanel extends JPanel {
         });
 
         JPanel hexPanel = new JPanel(new BorderLayout());
-        hexPanel.add(new JScrollPane(dumpViewHexTable), BorderLayout.CENTER);
+        hexPanel.add(new FasterScrollPane(dumpViewHexTable), BorderLayout.CENTER);
         hexPanel.add(searchPanel, BorderLayout.SOUTH);
         add(hexPanel, BorderLayout.CENTER);
     }
diff --git a/src/com/jpexs/decompiler/flash/gui/generictageditors/Amf3ValueEditor.java b/src/com/jpexs/decompiler/flash/gui/generictageditors/Amf3ValueEditor.java
index f7482bebe..4534ed19c 100644
--- a/src/com/jpexs/decompiler/flash/gui/generictageditors/Amf3ValueEditor.java
+++ b/src/com/jpexs/decompiler/flash/gui/generictageditors/Amf3ValueEditor.java
@@ -19,6 +19,7 @@ package com.jpexs.decompiler.flash.gui.generictageditors;
 import com.jpexs.decompiler.flash.amf.amf3.Amf3Value;
 import com.jpexs.decompiler.flash.exporters.amf.amf3.Amf3Exporter;
 import com.jpexs.decompiler.flash.gui.AppStrings;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.gui.View;
 import com.jpexs.decompiler.flash.gui.editor.LineMarkedEditorPane;
 import com.jpexs.decompiler.flash.importers.amf.amf3.Amf3Importer;
@@ -149,7 +150,7 @@ public class Amf3ValueEditor extends JPanel implements GenericTagEditor, FullSiz
         titlePanel.add(helpButton, BorderLayout.EAST);
         add(titlePanel, BorderLayout.NORTH);
 
-        add(new JScrollPane(editor), BorderLayout.CENTER);
+        add(new FasterScrollPane(editor), BorderLayout.CENTER);
         add(errorLabel, BorderLayout.SOUTH);
         errorLabel.setBackground(Color.red);
         errorLabel.setForeground(Color.white);
diff --git a/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java b/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
index 11060e563..19c7b4d38 100644
--- a/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
+++ b/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
@@ -21,6 +21,7 @@ import com.jpexs.decompiler.flash.RunnableIOEx;
 import com.jpexs.decompiler.flash.configuration.Configuration;
 import com.jpexs.decompiler.flash.gui.AppFrame;
 import com.jpexs.decompiler.flash.gui.AppStrings;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.gui.GuiAbortRetryIgnoreHandler;
 import com.jpexs.decompiler.flash.gui.Main;
 import com.jpexs.decompiler.flash.gui.MainFrame;
@@ -263,7 +264,7 @@ public class ProxyFrame extends AppFrame implements CatchedListener, MouseListen
         switchButton.addActionListener(this::switchStateButtonActionPerformed);
         Container cnt = getContentPane();
         cnt.setLayout(new BorderLayout());
-        cnt.add(new JScrollPane(replacementsTable), BorderLayout.CENTER);
+        cnt.add(new FasterScrollPane(replacementsTable), BorderLayout.CENTER);
 
         portField.setPreferredSize(new Dimension(80, portField.getPreferredSize().height));
         JPanel buttonsPanel = new JPanel();
diff --git a/src/com/jpexs/decompiler/flash/gui/timeline/TimelinePanel.java b/src/com/jpexs/decompiler/flash/gui/timeline/TimelinePanel.java
index 8b30e440f..8ab5e0b7f 100644
--- a/src/com/jpexs/decompiler/flash/gui/timeline/TimelinePanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/timeline/TimelinePanel.java
@@ -17,6 +17,7 @@
 package com.jpexs.decompiler.flash.gui.timeline;
 
 import com.jpexs.decompiler.flash.configuration.Configuration;
+import com.jpexs.decompiler.flash.gui.FasterScrollPane;
 import com.jpexs.decompiler.flash.timeline.Timeline;
 import com.jpexs.decompiler.flash.timeline.Timelined;
 import java.awt.BorderLayout;
@@ -85,7 +86,7 @@ public class TimelinePanel extends JPanel {
         timelineBodyPanel = new TimelineBodyPanel(timeline);
         setLayout(new BorderLayout());
 
-        JScrollPane sp = new JScrollPane(timelineBodyPanel);
+        JScrollPane sp = new FasterScrollPane(timelineBodyPanel);
 
         depthPanel = new TimelineDepthPanel(timeline);