diff --git a/frontend/src/lib/components/apps/components/helpers/RefreshButton.svelte b/frontend/src/lib/components/apps/components/helpers/RefreshButton.svelte
index ecb8278cf1..71c5e2dbd3 100644
--- a/frontend/src/lib/components/apps/components/helpers/RefreshButton.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RefreshButton.svelte
@@ -1,23 +1,26 @@
 <script lang="ts">
 	import { Button } from '$lib/components/common'
-	import { LoaderIcon, RefreshCw } from 'lucide-svelte'
+	import { LoaderIcon, RefreshCw, RefreshCwOff } from 'lucide-svelte'
 	import { getContext } from 'svelte'
 	import { twMerge } from 'tailwind-merge'
 	import Popover from '$lib/components/Popover.svelte'
-	import type { AppViewerContext } from '../../types'
+	import type { AppViewerContext, CancelablePromise } from '../../types'
 
 	export let id: string
 	export let loading: boolean
 
 	const { runnableComponents } = getContext<AppViewerContext>('AppViewerContext')
+	let buttonHover = false
+	let cancelCallbacks: (CancelablePromise<void>)[] | undefined = undefined
 </script>
 
 <Popover>
 	<Button
+		on:mouseenter={() => (buttonHover = true)} on:mouseleave={() => (buttonHover = false)} 
 		startIcon={{
-			icon: loading ? LoaderIcon : RefreshCw,
+			icon: loading ? !buttonHover ? LoaderIcon : RefreshCwOff : RefreshCw,
 			classes: twMerge(
-				loading ? 'animate-spin text-blue-800' : '',
+				loading && !buttonHover ? 'animate-spin text-blue-800' : '',
 				'transition-all text-gray-500 dark:text-white'
 			)
 		}}
@@ -25,13 +28,21 @@
 		size="xs2"
 		btnClasses={twMerge(loading ? ' bg-blue-100 dark:bg-blue-400' : '', 'transition-all')}
 		on:click={() => {
-			$runnableComponents[id]?.cb?.map((cb) => cb())
+			if (buttonHover && loading) {
+				cancelCallbacks?.forEach((cb) => cb.cancel()) 
+			} else {
+				cancelCallbacks = $runnableComponents[id]?.cb?.map((cb) =>  cb())
+			}
 		}}
 		iconOnly
 	/>
 	<svelte:fragment slot="text">
 		{#if loading}
-			Refreshing...
+			{#if buttonHover}
+				Stop Refreshing
+			{:else}
+				Refreshing...
+			{/if}
 		{:else}
 			Refresh
 		{/if}