diff --git a/source/texteditor.pas b/source/texteditor.pas
index d75bdb3b..a29e7b39 100644
--- a/source/texteditor.pas
+++ b/source/texteditor.pas
@@ -289,6 +289,9 @@ begin
     AppSettings.SessionPath := MainForm.GetRegKeyTable;
     AppSettings.WriteString(asMemoEditorHighlighter, comboHighlighter.Text, FTableColumn.Name);
   end;
+  // Fixes EAccessViolation under 64-bit when using non-default themes
+  if Assigned(Panel1) then
+    Panel1.Parent := nil;
 end;