diff --git a/Shell/main.cpp b/Shell/main.cpp
index 992f2740cb..99a4b780ba 100644
--- a/Shell/main.cpp
+++ b/Shell/main.cpp
@@ -981,6 +981,13 @@ int main(int argc, char** argv)
     if (rc < 0)
         perror("ttyname_r");
 
+    {
+        auto* cwd = getcwd(nullptr, 0);
+        g.cwd = cwd;
+        setenv("PWD", cwd, 1);
+        free(cwd);
+    }
+
     {
         auto* pw = getpwuid(getuid());
         if (pw) {
@@ -1012,13 +1019,6 @@ int main(int argc, char** argv)
         return 0;
     }
 
-    {
-        auto* cwd = getcwd(nullptr, 0);
-        g.cwd = cwd;
-        setenv("PWD", cwd, 1);
-        free(cwd);
-    }
-
     g.directory_stack.append(g.cwd);
 
     load_history();