diff --git a/.aliases/command-specific/emacsclient b/.aliases/command-specific/emacsclient
index 9929af9..6f86af3 100644
--- a/.aliases/command-specific/emacsclient
+++ b/.aliases/command-specific/emacsclient
@@ -6,5 +6,7 @@ alias ec="e -c"
 alias ecn="ec -n"
 
 function magit() {
-	en -e "(progn (cd \"$(realpath ${1-.})\") (magit-status))"
+	ecn -e '(progn (let ((old-frame (selected-frame)))
+              (magit-status "'"$(realpath ${1-.})"'")
+              (delete-frame old-frame)))'
 }