diff --git a/source/main.dfm b/source/main.dfm
index 12fcf965..106be38a 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -2505,6 +2505,14 @@ object MainForm: TMainForm
       ShortCut = 16471
       OnExecute = actClearEditorExecute
     end
+    object actClearQueryLog: TAction
+      Category = 'SQL'
+      Caption = 'Clear'
+      Hint = 'Clear query log'
+      ImageIndex = 58
+      ShortCut = 16465
+      OnExecute = actClearEditorExecute
+    end
     object actQueryStopOnErrors: TAction
       Category = 'SQL'
       AutoCheck = True
@@ -9734,9 +9742,7 @@ object MainForm: TMainForm
       OnClick = Copylinetonewquerytab1Click
     end
     object Clear2: TMenuItem
-      Caption = 'Clear'
-      ImageIndex = 58
-      OnClick = Clear2Click
+      Action = actClearQueryLog
     end
     object menuLogHorizontalScrollbar: TMenuItem
       Action = actLogHorizontalScrollbar
diff --git a/source/main.pas b/source/main.pas
index aa9626ef..1612729f 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -641,6 +641,7 @@ type
     ToolButton11: TToolButton;
     actCopyRows: TAction;
     Copyselectedrows1: TMenuItem;
+    actClearQueryLog: TAction;
     procedure actCreateDBObjectExecute(Sender: TObject);
     procedure menuConnectionsPopup(Sender: TObject);
     procedure actExitApplicationExecute(Sender: TObject);
@@ -717,7 +718,6 @@ type
     procedure ListTablesNewText(Sender: TBaseVirtualTree; Node: PVirtualNode;
         Column: TColumnIndex; NewText: String);
     procedure TimerConnectedTimer(Sender: TObject);
-    procedure Clear2Click(Sender: TObject);
     procedure QuickFilterClick(Sender: TObject);
     procedure AutoRefreshSetInterval(Sender: TObject);
     procedure AutoRefreshToggle(Sender: TObject);
@@ -2289,9 +2289,12 @@ procedure TMainForm.actClearEditorExecute(Sender: TObject);
 var
   m: TSynMemo;
 begin
-  if Sender = actClearQueryEditor then
+  if Sender = actClearQueryEditor then begin
     m := ActiveQueryMemo
-  else begin
+  end else if Sender = actClearQueryLog then begin
+    m := SynMemoSQLLog;
+    m.Gutter.LineNumberStart := m.Gutter.LineNumberStart + m.Lines.Count;
+  end else begin
     m := SynMemoFilter;
     editFilterSearch.Clear;
   end;
@@ -2299,12 +2302,13 @@ begin
   m.SelText := '';
   m.SelStart := 0;
   m.SelEnd := 0;
-  if QueryTabActive then begin
+  if Sender = actClearQueryEditor then begin
     ActiveQueryTab.MemoFilename := '';
     ActiveQueryTab.Memo.Modified := False;
   end;
-  if m = SynMemoFilter then
+  if m = SynMemoFilter then begin
     InvalidateVT(DataGrid, VTREE_NOTLOADED_PURGECACHE, False);
+  end;
 end;
 
 
@@ -5940,16 +5944,6 @@ begin
 end;
 
 
-procedure TMainForm.Clear2Click(Sender: TObject);
-begin
-  // clear history-memo
-  Screen.Cursor := crHourglass;
-  SynMemoSQLLog.Gutter.LineNumberStart := SynMemoSQLLog.Gutter.LineNumberStart + SynMemoSQLLog.Lines.Count;
-  SynMemoSQLLog.Lines.Clear;
-  Screen.Cursor := crDefault;
-end;
-
-
 procedure TMainForm.Copylinetonewquerytab1Click(Sender: TObject);
 var
   Tab: TQueryTab;