diff --git a/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift b/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift
index 0d31399b..162ce8d4 100644
--- a/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift
+++ b/Core/Sources/SuggestionWidget/SuggestionWidgetController.swift
@@ -172,10 +172,11 @@ public final class SuggestionWidgetController: NSObject {
                         if app != previousApp {
                             windowChangeObservationTask?.cancel()
                             windowChangeObservationTask = nil
-                            self.observeXcodeWindowChangeIfNeeded(app)
+                            observeXcodeWindowChangeIfNeeded(app)
                         }
-                        await self.updateContentForActiveEditor()
-                        self.updateWindowLocation()
+                        await updateContentForActiveEditor()
+                        updateWindowLocation()
+                        orderFront()
                     } else {
                         if ActiveApplicationMonitor.activeApplication?.bundleIdentifier != Bundle
                             .main.bundleIdentifier
@@ -203,11 +204,8 @@ public final class SuggestionWidgetController: NSObject {
                     guard let activeXcode = ActiveApplicationMonitor.activeXcode else { continue }
                     guard fullscreenDetector.isOnActiveSpace else { continue }
                     let app = AXUIElementCreateApplication(activeXcode.processIdentifier)
-                    if let window = app.focusedWindow, window.isFullScreen {
-                        widgetWindow.orderFrontRegardless()
-                        tabWindow.orderFrontRegardless()
-                        panelWindow.orderFrontRegardless()
-                        chatWindow.orderFrontRegardless()
+                    if let window = app.focusedWindow {
+                        orderFront()
                     }
                 }
             }
@@ -263,6 +261,13 @@ public final class SuggestionWidgetController: NSObject {
             }
         }
     }
+    
+    func orderFront() {
+        widgetWindow.orderFrontRegardless()
+        tabWindow.orderFrontRegardless()
+        panelWindow.orderFrontRegardless()
+        chatWindow.orderFrontRegardless()
+    }
 }
 
 // MARK: - Handle Events
diff --git a/Core/Sources/SuggestionWidget/SyntaxHighlighting.swift b/Core/Sources/SuggestionWidget/SyntaxHighlighting.swift
index 761546d7..ce856445 100644
--- a/Core/Sources/SuggestionWidget/SyntaxHighlighting.swift
+++ b/Core/Sources/SuggestionWidget/SyntaxHighlighting.swift
@@ -77,7 +77,8 @@ func highlightedCodeBlock(
         return formatted
     default:
         var language = language
-        if language == "objective-c" {
+        // Workaround: Highlightr uses a different identifier for Objective-C.
+        if language.lowercased().hasPrefix("objective"), language.lowercased().hasSuffix("c") {
             language = "objectivec"
         }
         func unhighlightedCode() -> NSAttributedString {
diff --git a/Version.xcconfig b/Version.xcconfig
index 10f85f0e..6542541d 100644
--- a/Version.xcconfig
+++ b/Version.xcconfig
@@ -1,2 +1,2 @@
-APP_VERSION = 0.16.0
-APP_BUILD = 160
+APP_VERSION = 0.16.1
+APP_BUILD = 161
diff --git a/appcast.xml b/appcast.xml
index b8dcbd59..3feebf09 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -3,6 +3,18 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+    <item>
+      <title>0.16.1</title>
+      <pubDate>Tue, 23 May 2023 11:06:14 +0800</pubDate>
+      <sparkle:version>161</sparkle:version>
+      <sparkle:shortVersionString>0.16.1</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.16.1
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.16.1/Copilot.for.Xcode.app.zip" length="21012368" type="application/octet-stream" sparkle:edSignature="Z4Krbh53X0frA0WhhGHh2QXEKUJQz65SXQKFyn6rJmk7eXdbF0HhllEchUUooeQMeeIkR8I2VhK5Uq7Qenh1Dw=="/>
+    </item>
+
     <item>
       <title>0.16.0</title>
       <pubDate>Thu, 18 May 2023 18:42:47 +0800</pubDate>
@@ -14,7 +26,7 @@
       </sparkle:releaseNotesLink>
       <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.16.0/Copilot.for.Xcode.app.zip" length="21012542" type="application/octet-stream" sparkle:edSignature="K/lsLbYeNCJrE71a9xaUOf3lD5SyFqrkgMlTUd7xJinMnx4fWkP9WtzPFCq9n/A2H6X1awFtDhov6mEkMhx7Bg=="/>
     </item>
-    
+
     <item>
       <title>0.15.4</title>
       <pubDate>Mon, 15 May 2023 22:13:11 +0800</pubDate>