diff --git a/dokku b/dokku
index b5962e283..8ecbd08e0 100755
--- a/dokku
+++ b/dokku
@@ -61,7 +61,9 @@ if [[ -n "$SSH_ORIGINAL_COMMAND" ]]; then
     xargs $0 <<<$SSH_ORIGINAL_COMMAND
     exit $?
   else
+    set -f
     $0 $SSH_ORIGINAL_COMMAND
+    set +f
     exit $?
   fi
 fi
diff --git a/plugins/domains/commands b/plugins/domains/commands
index e9377ebf0..c27807ba7 100755
--- a/plugins/domains/commands
+++ b/plugins/domains/commands
@@ -65,7 +65,7 @@ case "$1" in
       exit 1
     fi
 
-    if [[ $(egrep ^"$3"$ "$DOKKU_ROOT/$APP/VHOST" > /dev/null 2>&1; echo $?) -eq 0 ]]; then
+    if [[ $(egrep -w "^{$3}$" "$DOKKU_ROOT/$APP/VHOST" > /dev/null 2>&1; echo $?) -eq 0 ]]; then
       echo "$3 is already defined for $APP"
       exit 1
     fi
diff --git a/tests/unit/domains.bats b/tests/unit/domains.bats
index de07060e3..7538f4028 100644
--- a/tests/unit/domains.bats
+++ b/tests/unit/domains.bats
@@ -46,6 +46,17 @@ teardown() {
   refute_line "test.app.dokku.me"
 }
 
+@test "(domains) domains:remove (wildcard domain)" {
+  run dokku domains:add $TEST_APP *.dokku.me
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  run dokku domains:remove $TEST_APP *.dokku.me
+  echo "output: "$output
+  echo "status: "$status
+  refute_line "*.dokku.me"
+}
+
 @test "(domains) domains:clear" {
   run dokku domains:add $TEST_APP test.app.dokku.me
   echo "output: "$output