diff --git a/source/routine_editor.pas b/source/routine_editor.pas
index 0d02ac96..a3a717f1 100644
--- a/source/routine_editor.pas
+++ b/source/routine_editor.pas
@@ -183,6 +183,12 @@ begin
   Modified := False;
   btnSave.Enabled := Modified;
   btnDiscard.Enabled := Modified;
+  // Buttons are randomly moved, since VirtualTree update, see #440
+  btnSave.Top := Height - btnSave.Height - Round(3 * DpiScaleFactor(MainForm));
+  btnHelp.Top := btnSave.Top;
+  btnDiscard.Top := btnSave.Top;
+  btnRunProc.Top := btnSave.Top;
+  btnRunProc.Left := Width - btnRunProc.Width - Round(3 * DpiScaleFactor(MainForm));
   Mainform.actRunRoutines.Enabled := DBObject.Name <> '';
   Mainform.ShowStatusMsg;
   Screen.Cursor := crDefault;