diff --git a/ElementX/Sources/Application/Windowing/WindowManager.swift b/ElementX/Sources/Application/Windowing/WindowManager.swift
index b7208a848..e9a42d1c5 100644
--- a/ElementX/Sources/Application/Windowing/WindowManager.swift
+++ b/ElementX/Sources/Application/Windowing/WindowManager.swift
@@ -66,5 +66,10 @@ class WindowManager {
         alternateWindow.isHidden = false
         overlayWindow.isHidden = true
         mainWindow.isHidden = true
+        
+        // We don't know what route the app will use when returning back
+        // to the main window, so end any editing operation now to avoid
+        // e.g. the keyboard being displayed on top of a call sheet.
+        mainWindow.endEditing(true)
     }
 }
diff --git a/changelog.d/2025.bugfix b/changelog.d/2025.bugfix
new file mode 100644
index 000000000..121b49584
--- /dev/null
+++ b/changelog.d/2025.bugfix
@@ -0,0 +1 @@
+Fix a bug where tapping a call link could open the call with a keyboard obscuring the sheet.
\ No newline at end of file