diff --git a/dmenu_ssh b/dmenu_ssh
index 9f3e2ae..000b431 100755
--- a/dmenu_ssh
+++ b/dmenu_ssh
@@ -3,7 +3,11 @@
 export SSH_AUTH_SOCK="${HOME}/.ssh/ssh_auth_sock"
 cmd=$1
 shift
-result=$(sed "s/[, ].*//" ~/.ssh/known_hosts | sort -u | dmenu -p ssh ${1+"$@"}) || exit 1
+get_hosts() {
+    awk -F",| " '{print $1}' "${HOME}/.ssh/known_hosts"
+    awk '{if ($1 == "Host") print $2}' "${HOME}/.ssh/config"
+}
+result=$(get_hosts | sort -u | dmenu -p ssh ${1+"$@"}) || exit 1
 exec $cmd $result
 
 # call from ~/.i3/config: