diff --git a/.changes/next-release/bugfix-afb46d2b-24c7-48be-94b1-02a7f56cbde0.json b/.changes/next-release/bugfix-afb46d2b-24c7-48be-94b1-02a7f56cbde0.json
new file mode 100644
index 00000000000..090ccd90650
--- /dev/null
+++ b/.changes/next-release/bugfix-afb46d2b-24c7-48be-94b1-02a7f56cbde0.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Q panel will get stuck while signin if users have multiple windows"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
index 75120cf493e..f9279eb61be 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
@@ -95,7 +95,8 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
         project.messageBus.connect(toolWindow.disposable).subscribe(
             QRegionProfileSelectedListener.TOPIC,
             object : QRegionProfileSelectedListener {
-                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
+                // note we name myProject intentionally ow it will shadow the "project" provided by the IDE
+                override fun onProfileSelected(myProject: Project, profile: QRegionProfile?) {
                     if (project.isDisposed) return
                     AmazonQToolWindow.getInstance(project).disposeAndRecreate()
                     qPanel.setContent(AmazonQToolWindow.getInstance(project).component)