From 7d828d26b24927a1d457873e50cb984725dbeea5 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Thu, 26 Feb 2026 18:56:44 +0100
Subject: [PATCH] fix: crash when holding shift + arrow down then arrow up in
 last row of data grid

Closes #1451
---
 source/main.pas | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index 03adf094..27119606 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -10921,9 +10921,9 @@ begin
         Key := 0;
       end;
     end;
-    VK_RETURN: if Assigned(g.FocusedNode) then g.EditNode(g.FocusedNode, g.FocusedColumn);
-    VK_DOWN: if g.FocusedNode = g.GetLast then actDataInsertExecute(actDataInsert);
-    VK_NEXT: if (g = DataGrid) and (g.FocusedNode = g.GetLast) then actDataShowNext.Execute;
+    VK_RETURN: if Assigned(g.FocusedNode) and (Shift=[]) then g.EditNode(g.FocusedNode, g.FocusedColumn);
+    VK_DOWN: if (g.FocusedNode = g.GetLast) and (Shift=[]) then actDataInsertExecute(actDataInsert);
+    VK_NEXT: if (g = DataGrid) and (g.FocusedNode = g.GetLast) and (Shift=[]) then actDataShowNext.Execute;
   end;
 end;