diff --git a/aerospace/.config/aerospace/aerospace.toml b/aerospace/.config/aerospace/aerospace.toml
index 288f1b8..0d0eb04 100644
--- a/aerospace/.config/aerospace/aerospace.toml
+++ b/aerospace/.config/aerospace/aerospace.toml
@@ -288,3 +288,8 @@ run = ['layout floating']
 [[on-window-detected]]
 if.app-id = 'com.electron.logseq'
 run = 'move-node-to-workspace Q'
+
+# Float Facetime windows
+[[on-window-detected]]
+if.app-id = 'com.apple.FaceTime'
+run = 'layout floating'
diff --git a/aerospace/.config/shell-common/99_aerospace.sh b/aerospace/.config/shell-common/99_aerospace.sh
new file mode 100644
index 0000000..28a3462
--- /dev/null
+++ b/aerospace/.config/shell-common/99_aerospace.sh
@@ -0,0 +1,8 @@
+# Aerospace specific shell configuration
+
+# Fuzzy find and focus a window using aerospace and fzf
+if [ -x "$(command -v aerospace)" ] && [ -x "$(command -v fzf)" ]; then
+    function ff() {
+        aerospace list-windows --all | fzf --height 40% --layout=reverse --border --ansi | awk '{print $1}' | xargs -I {} aerospace focus --window-id {}
+    }
+fi