diff --git a/CHANGELOG.md b/CHANGELOG.md
index b47848b9d..4042c2a79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,6 +76,7 @@ All notable changes to this project will be documented in this file.
 - AS1/2 Renaming of identifiers must not rename integer array offsets
 - [#2517] Loop break detection problems in some cases
 - [#2519] AS1/2 avoid multi-level loops in cases where possible
+- [#2522] Hex view - reseting view when mouse over panel bottom
 
  ### Changed
 - Icon of "Deobfuscation options" menu from pile of pills to medkit
@@ -3990,6 +3991,7 @@ Major version of SWF to XML export changed to 2.
 [#2515]: https://www.free-decompiler.com/flash/issues/2515
 [#2516]: https://www.free-decompiler.com/flash/issues/2516
 [#2517]: https://www.free-decompiler.com/flash/issues/2517
+[#2522]: https://www.free-decompiler.com/flash/issues/2522
 [#2476]: https://www.free-decompiler.com/flash/issues/2476
 [#2404]: https://www.free-decompiler.com/flash/issues/2404
 [#1418]: https://www.free-decompiler.com/flash/issues/1418
diff --git a/src/com/jpexs/decompiler/flash/gui/hexview/HexView.java b/src/com/jpexs/decompiler/flash/gui/hexview/HexView.java
index 9d72852a1..05be64fb5 100644
--- a/src/com/jpexs/decompiler/flash/gui/hexview/HexView.java
+++ b/src/com/jpexs/decompiler/flash/gui/hexview/HexView.java
@@ -181,7 +181,9 @@ public class HexView extends JTable {
             int col = table.columnAtPoint(point);
             int row = table.rowAtPoint(point);
             mouseOverIdx = -1;
-            getModel().fireTableCellUpdated(row, col);
+            if (row > -1 && col > -1) {
+                getModel().fireTableCellUpdated(row, col);
+            }
             if (listener != null) {
                 listener.byteMouseMoved(-1, (byte) 0);
             }