diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po
index 00b16041..47ce06dd 100644
--- a/out/locale/en/LC_MESSAGES/default.po
+++ b/out/locale/en/LC_MESSAGES/default.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2012-12-13 21:33+0100\n"
+"PO-Revision-Date: 2012-12-18 19:28+0100\n"
 "Last-Translator: Ansgar Becker <heidisql@anse.de>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
 "language/en/)\n"
@@ -5562,3 +5562,9 @@ msgstr "Minute"
 #. Table tools
 msgid "Second"
 msgstr "Second"
+
+#. Query tab close button
+msgid ""
+"Cannot close tab with running query. Please wait until query has finished."
+msgstr ""
+"Cannot close tab with running query. Please wait until query has finished."
diff --git a/source/main.pas b/source/main.pas
index 10860fef..686bf3f1 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -9576,9 +9576,12 @@ var
   Tab: TQueryTab;
 begin
   Tab := QueryTabs[PageIndex-tabQuery.PageIndex];
-  if (not Tab.Memo.Modified) or (not AppSettings.ReadBool(asPromptSaveFileOnTabClose)) then
-    Result := True
-  else begin
+  if Tab.QueryRunning then begin
+    LogSQL(_('Cannot close tab with running query. Please wait until query has finished.'));
+    Result := False;
+  end else if not Tab.Memo.Modified then begin
+    Result := True;
+  end else begin
     // Unhide tabsheet so the user sees the memo content
     Tab.TabSheet.PageControl.ActivePage := Tab.TabSheet;
     if Tab.MemoFilename <> '' then