diff --git a/bin/ec b/bin/ec
index 0fe1352..1d55a26 100755
--- a/bin/ec
+++ b/bin/ec
@@ -1,6 +1,8 @@
 #!/bin/bash
-if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
-  emacsclient -a "" -t "$@"
+TEXT_FLAGS='-a "" -t'
+GUI_FLAGS='-n -a "" -c'
+if [ -z "$DISPLAY" ]; then
+  emacsclient $TEXT_FLAGS "$@"
 else
-  emacsclient -n -a "" -c "$@"
+  emacsclient $GUI_FLAGS "$@"
 fi