diff --git a/config/aerospace/aerospace.toml b/config/aerospace/aerospace.toml
index 17d5b69..25dab58 100644
--- a/config/aerospace/aerospace.toml
+++ b/config/aerospace/aerospace.toml
@@ -162,3 +162,8 @@ if.app-id = 'company.thebrowser.Browser'
 if.window-title-regex-substring = '^[^Space|Little]'
 check-further-callbacks = true
 run = 'layout tiling'
+
+[[on-window-detected]]
+if.app-id = 'io.zsa.keymapp'
+check-further-callbacks = true
+run = 'layout floating'
diff --git a/homebrew/mac-mini b/homebrew/mac-mini
index 184a8ae..30ffc83 100644
--- a/homebrew/mac-mini
+++ b/homebrew/mac-mini
@@ -452,6 +452,8 @@ cask "kap"
 cask "karabiner-elements"
 # Open-source keystroke visualiser
 cask "keycastr"
+# ZSA keyboard firmware flasher
+cask "keymapp"
 # Grammar, spelling and style suggestions in all the writing apps
 cask "languagetool"
 # Official client for LBRY, a decentralised file-sharing and payment network