diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
index 3f384d6c476..3bdeda97713 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
@@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.components.JBLoadingPanel
 import com.intellij.ui.components.JBTextArea
+import com.intellij.ui.components.ProgressBarLoadingDecorator
 import com.intellij.ui.components.panels.Wrapper
 import com.intellij.ui.dsl.builder.Align
 import com.intellij.ui.dsl.builder.AlignX
@@ -103,7 +104,14 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
             }
             browser.complete(null)
         } else {
-            val loadingPanel = JBLoadingPanel(null, this)
+            val loadingPanel = if (isRunningOnRemoteBackend()) {
+                JBLoadingPanel(null) {
+                    ProgressBarLoadingDecorator(it, this, -1)
+                }
+            } else {
+                JBLoadingPanel(null, this)
+            }
+
             val wrapper = Wrapper()
             loadingPanel.startLoading()