diff --git a/core/io/files/files-tests.factor b/core/io/files/files-tests.factor
index 92e148a854..f804d7c5ac 100755
--- a/core/io/files/files-tests.factor
+++ b/core/io/files/files-tests.factor
@@ -121,3 +121,5 @@ USING: tools.test io.files io threads kernel continuations ;
 [ ] [ "copy-destination" temp-file delete-tree ] unit-test
 
 [ ] [ "copy-tree-test" temp-file delete-tree ] unit-test
+
+[ t ] [ cwd "core" resource-path [ ] with-directory cwd = ] unit-test
diff --git a/core/io/files/files.factor b/core/io/files/files.factor
index 85f0621443..55eee65bbf 100755
--- a/core/io/files/files.factor
+++ b/core/io/files/files.factor
@@ -70,7 +70,7 @@ HOOK: cd io-backend ( path -- )
 HOOK: cwd io-backend ( -- path )
 
 : with-directory ( path quot -- )
-    swap cd cwd [ cd ] curry [ ] cleanup ; inline
+    cwd [ cd ] curry rot cd [ ] cleanup ; inline
 
 ! Creating directories
 HOOK: make-directory io-backend ( path -- )
@@ -209,4 +209,4 @@ HOOK: <file-appender> io-backend ( path -- stream )
         { [ winnt? ] [ "USERPROFILE" os-env ] }
         { [ wince? ] [ "" resource-path ] }
         { [ unix? ] [ "HOME" os-env ] }
-    } cond ;
\ No newline at end of file
+    } cond ;