diff --git a/packages/web/src/modals/ImportExportModal.svelte b/packages/web/src/modals/ImportExportModal.svelte
index 20a6e7142..bf154a035 100644
--- a/packages/web/src/modals/ImportExportModal.svelte
+++ b/packages/web/src/modals/ImportExportModal.svelte
@@ -155,7 +155,11 @@
             <RunnerOutputFiles {runnerId} {executeNumber} />
           </WidgetColumnBarItem>
           <WidgetColumnBarItem title="Messages" name="messages">
-            <SocketMessageView eventName={runnerId ? `runner-info-${runnerId}` : null} {executeNumber} />
+            <SocketMessageView
+              eventName={runnerId ? `runner-info-${runnerId}` : null}
+              {executeNumber}
+              showNoMessagesAlert
+            />
           </WidgetColumnBarItem>
           <WidgetColumnBarItem title="Preview" name="preview" skip={!$previewReaderStore}>
             <PreviewDataGrid reader={$previewReaderStore} />
diff --git a/packages/web/src/query/RunnerOutputPane.svelte b/packages/web/src/query/RunnerOutputPane.svelte
index 2e283a6be..c53341e61 100644
--- a/packages/web/src/query/RunnerOutputPane.svelte
+++ b/packages/web/src/query/RunnerOutputPane.svelte
@@ -11,7 +11,7 @@
 <HorizontalSplitter>
   <div class="container" slot="1">
     <WidgetTitle>Messages</WidgetTitle>
-    <SocketMessageView eventName={runnerId ? `runner-info-${runnerId}` : null} {executeNumber} />
+    <SocketMessageView eventName={runnerId ? `runner-info-${runnerId}` : null} {executeNumber} showNoMessagesAlert />
   </div>
   <div class="container" slot="2">
     <WidgetTitle>Output files</WidgetTitle>
diff --git a/packages/web/src/query/SocketMessageView.svelte b/packages/web/src/query/SocketMessageView.svelte
index 629011b71..05dd4c117 100644
--- a/packages/web/src/query/SocketMessageView.svelte
+++ b/packages/web/src/query/SocketMessageView.svelte
@@ -13,6 +13,7 @@
   export let showLine = false;
   export let eventName;
   export let executeNumber;
+  export let showNoMessagesAlert = false;
 
   const cachedMessagesRef = createRef([]);
 
@@ -47,7 +48,7 @@
   $: $effect;
 </script>
 
-{#if !displayedMessages || displayedMessages.length == 0}
+{#if showNoMessagesAlert && (!displayedMessages || displayedMessages.length == 0)}
   <ErrorInfo message="No messages" icon="img alert" />
 {:else}
   <MessageView items={displayedMessages} on:messageclick {showProcedure} {showLine} />
diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte
index 8cb287992..937df89c2 100644
--- a/packages/web/src/tabs/QueryTab.svelte
+++ b/packages/web/src/tabs/QueryTab.svelte
@@ -30,7 +30,6 @@
     findReplace: true,
     executeAdditionalCondition: () => getCurrentEditor()?.hasConnection(),
   });
-
 </script>
 
 <script lang="ts">
@@ -59,6 +58,7 @@
   import createActivator, { getActiveComponent } from '../utility/createActivator';
   import { findEngineDriver } from 'dbgate-tools';
   import AceEditor from '../query/AceEditor.svelte';
+  import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte';
 
   export let tabid;
   export let conid;
@@ -245,7 +245,6 @@
       { command: 'query.replace' },
     ];
   }
-
 </script>
 
 <VerticalSplitter isSplitter={visibleResultTabs}>
@@ -292,3 +291,7 @@
     </ResultTabs>
   </svelte:fragment>
 </VerticalSplitter>
+
+{#if sessionId}
+  <StatusBarTabItem icon={busy ? 'icon loading' : 'icon check'} text={busy ? 'Running...' : 'Finished'} />
+{/if}