diff --git a/plugins/apps/subcommands/clone b/plugins/apps/subcommands/clone
index fad859544..7a28e9f7a 100755
--- a/plugins/apps/subcommands/clone
+++ b/plugins/apps/subcommands/clone
@@ -21,9 +21,9 @@ apps_clone_cmd() {
   local NEW_CACHE_DIR="$DOKKU_ROOT/$NEW_APP/cache"
 
   apps_create "$NEW_APP"
-  cd "$DOKKU_ROOT/$OLD_APP/."
-  find * -not \( -name .cache \) | cpio -pvdmu "$DOKKU_ROOT/$NEW_APP"
-  cd -
+  pushd "$DOKKU_ROOT/$OLD_APP/."
+  find ./* -not \( -name .cache \) | cpio -pvdmu "$DOKKU_ROOT/$NEW_APP"
+  popd
 
   if [[ -d "$NEW_CACHE_DIR" ]] && ! rmdir "$NEW_CACHE_DIR"; then
     docker run "$DOKKU_GLOBAL_RUN_ARGS" --rm -v "$NEW_CACHE_DIR:/cache" "dokku/$OLD_APP" chmod 777 -R /cache