diff --git a/Core/Sources/HostApp/GeneralView.swift b/Core/Sources/HostApp/GeneralView.swift
index d55b38d..0353f06 100644
--- a/Core/Sources/HostApp/GeneralView.swift
+++ b/Core/Sources/HostApp/GeneralView.swift
@@ -260,7 +260,7 @@ struct CopilotConnectionView: View {
 
     var connection: some View {
         VStack(alignment: .leading) {
-            Text(StringConstants.copilotResources)
+            Text(StringConstants.copilotConnection)
                 .bold()
                 .padding(.leading, 8)
             VStack(spacing: .zero) {
diff --git a/Core/Sources/HostApp/StringConstants.swift b/Core/Sources/HostApp/StringConstants.swift
index ebd04e3..5740f0f 100644
--- a/Core/Sources/HostApp/StringConstants.swift
+++ b/Core/Sources/HostApp/StringConstants.swift
@@ -16,6 +16,7 @@ struct StringConstants {
     static let turnOnCopilot = "Turn on Copilot for Xcode"
     static let turnOffAlertTitle = "Turn off Copilot for Xcode"
     static let turnOffAlertMessage = "If you turn off Copilot for Xcode, all features will be disabled."
+    static let copilotConnection = "Copilot Connection"
     static let githubAccountStatus = "Github Account Status Permissions"
     static let githubConnection = "Github Connection:"
     static let refreshConnection = "Refresh Connection"
diff --git a/Core/Sources/SuggestionWidget/ChatPanelWindow.swift b/Core/Sources/SuggestionWidget/ChatPanelWindow.swift
index 2745089..7d189aa 100644
--- a/Core/Sources/SuggestionWidget/ChatPanelWindow.swift
+++ b/Core/Sources/SuggestionWidget/ChatPanelWindow.swift
@@ -38,12 +38,13 @@ final class ChatPanelWindow: NSWindow {
         isReleasedWhenClosed = false
         isOpaque = false
         backgroundColor = .clear
-        level = .init(NSWindow.Level.floating.rawValue + 1)
+        level = widgetLevel(1)
         collectionBehavior = [
             .fullScreenAuxiliary,
             .transient,
             .fullScreenPrimary,
             .fullScreenAllowsTiling,
+            .canJoinAllSpaces
         ]
         hasShadow = true
         contentView = NSHostingView(
diff --git a/Core/Sources/SuggestionWidget/WidgetWindowsController.swift b/Core/Sources/SuggestionWidget/WidgetWindowsController.swift
index b8a4d56..72ad057 100644
--- a/Core/Sources/SuggestionWidget/WidgetWindowsController.swift
+++ b/Core/Sources/SuggestionWidget/WidgetWindowsController.swift
@@ -634,7 +634,7 @@ public final class WidgetWindows {
         it.isOpaque = false
         it.backgroundColor = .clear
         it.level = .floating
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
+        it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
         it.hasShadow = true
         it.contentView = NSHostingView(
             rootView: WidgetView(
@@ -660,8 +660,8 @@ public final class WidgetWindows {
         it.isReleasedWhenClosed = false
         it.isOpaque = false
         it.backgroundColor = .clear
-        it.level = .init(NSWindow.Level.floating.rawValue + 2)
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
+        it.level = widgetLevel(2)
+        it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
         it.hasShadow = true
         it.contentView = NSHostingView(
             rootView: SharedPanelView(
@@ -694,8 +694,8 @@ public final class WidgetWindows {
         it.isReleasedWhenClosed = false
         it.isOpaque = false
         it.backgroundColor = .clear
-        it.level = .init(NSWindow.Level.floating.rawValue + 2)
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
+        it.level = widgetLevel(2)
+        it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
         it.hasShadow = false
         it.contentView = NSHostingView(
             rootView: SuggestionPanelView(
@@ -741,8 +741,8 @@ public final class WidgetWindows {
         it.isReleasedWhenClosed = false
         it.isOpaque = true
         it.backgroundColor = .clear
-        it.level = .floating
-        it.collectionBehavior = [.fullScreenAuxiliary, .transient]
+        it.level = widgetLevel(0)
+        it.collectionBehavior = [.fullScreenAuxiliary, .transient, .canJoinAllSpaces]
         it.hasShadow = false
         it.contentView = NSHostingView(
             rootView: ToastPanelView(store: store.scope(
@@ -784,3 +784,9 @@ class CanBecomeKeyWindow: NSWindow {
     override var canBecomeMain: Bool { canBecomeKeyChecker() }
 }
 
+func widgetLevel(_ addition: Int) -> NSWindow.Level {
+    let minimumWidgetLevel: Int
+    minimumWidgetLevel = NSWindow.Level.floating.rawValue
+    return .init(minimumWidgetLevel + addition)
+}
+
diff --git a/Server/package-lock.json b/Server/package-lock.json
index 72de03f..bd41e39 100644
--- a/Server/package-lock.json
+++ b/Server/package-lock.json
@@ -8,13 +8,13 @@
       "name": "@github/copilot-xcode",
       "version": "0.0.1",
       "dependencies": {
-        "@github/copilot-language-server": "^1.236.0"
+        "@github/copilot-language-server": "^1.237.0"
       }
     },
     "node_modules/@github/copilot-language-server": {
-      "version": "1.236.0",
-      "resolved": "https://registry.npmjs.org/@github/copilot-language-server/-/copilot-language-server-1.236.0.tgz",
-      "integrity": "sha512-r9gKmWrfvDNN2epQZ5IBrsIZyIO7Odk+A2n/Y+2NHI1ZIfM60RP1p7DrFFwTTVaaodVpLZNIzFfaetW/68voug==",
+      "version": "1.237.0",
+      "resolved": "https://registry.npmjs.org/@github/copilot-language-server/-/copilot-language-server-1.237.0.tgz",
+      "integrity": "sha512-2LvMSFNs6smYoC5lndXWF57ara3iFa2j1/T+nrzHaFYPIDlcp/wq0N6TMXNGpeeYVz2EqLQ/1Vw52drOHGMztQ==",
       "bin": {
         "copilot-language-server": "dist/language-server.js"
       }
diff --git a/Server/package.json b/Server/package.json
index 5128126..b556127 100644
--- a/Server/package.json
+++ b/Server/package.json
@@ -4,6 +4,6 @@
   "description": "Package for downloading @github/copilot-language-server",
   "private": true,
   "dependencies": {
-    "@github/copilot-language-server": "^1.236.0"
+    "@github/copilot-language-server": "^1.237.0"
   }
 }