diff --git a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
index e71a1ceb61..398f4df9b3 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppAggridTable.svelte
@@ -430,11 +430,12 @@
 				bind:clientHeight
 				bind:clientWidth
 			>
-				<div class="py-1 flex flex-row justify-end items-center">
-					{#if componentInput?.type === 'runnable' && componentInput.autoRefresh}
+				{#if componentInput?.type === 'runnable' && componentInput.autoRefresh}
+					<div class="absolute top-2 right-2 z-50">
 						<RefreshButton {id} {loading} />
-					{/if}
-				</div>
+					</div>
+				{/if}
+
 				<div
 					on:pointerdown|stopPropagation={() => {
 						$selectedComponent = [id]
diff --git a/frontend/src/lib/components/apps/components/display/table/AppTable.svelte b/frontend/src/lib/components/apps/components/display/table/AppTable.svelte
index 676fa2664f..845a73f0fd 100644
--- a/frontend/src/lib/components/apps/components/display/table/AppTable.svelte
+++ b/frontend/src/lib/components/apps/components/display/table/AppTable.svelte
@@ -346,7 +346,7 @@
 >
 	{#if Array.isArray(result) && result.every(isObject)}
 		<div class="flex flex-col h-full">
-			{#if resolvedConfig.search !== 'Disabled' || (componentInput?.hideRefreshButton && componentInput['autoRefresh'])}
+			{#if resolvedConfig.search !== 'Disabled'}
 				<div class="flex flex-row w-full justify-between items-center h-12">
 					{#if resolvedConfig.search !== 'Disabled'}
 						<div class="grow max-w-[300px]">
@@ -364,6 +364,10 @@
 						<RefreshButton {id} {loading} />
 					{/if}
 				</div>
+			{:else if componentInput?.hideRefreshButton && componentInput['autoRefresh']}
+				<div class="absolute right-2 top-2 z-50">
+					<RefreshButton {id} {loading} />
+				</div>
 			{/if}
 			<div
 				class={twMerge(