diff --git a/plugins/available/base.plugin.bash b/plugins/available/base.plugin.bash
index 837d7536..aa35a708 100644
--- a/plugins/available/base.plugin.bash
+++ b/plugins/available/base.plugin.bash
@@ -80,8 +80,8 @@ function mkcd ()
     example '$ mkcd foo'
     example '$ mkcd /tmp/img/photos/large'
     group 'base'
-    mkdir -p "$*"
-    cd "$*"
+    mkdir -p -- "$*"
+    cd -- "$*"
 }
 
 function lsgrep ()
diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index 70950296..07b6afc7 100755
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -35,6 +35,12 @@ load ../../plugins/available/base.plugin
   [[ $output == l? ]]
 }
 
+@test 'plugins base: mkcd()' {
+  cd "${BASH_IT_ROOT}"
+  run mkcd -dir_with_dash
+  assert_success
+}
+
 @test 'plugins base: lsgrep()' {
   for i in 1 2 3; do mkdir -p "${BASH_IT_TEST_DIR}/${i}"; done
   cd $BASH_IT_TEST_DIR