diff --git a/src/app/common/modals/userinput.tsx b/src/app/common/modals/userinput.tsx
index f928149f1..b431043e4 100644
--- a/src/app/common/modals/userinput.tsx
+++ b/src/app/common/modals/userinput.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { GlobalModel } from "../../../models";
-import { Choose, When, If } from "tsx-control-statements";
+import { Choose, When, If } from "tsx-control-statements/components";
 import { Modal, PasswordField, Markdown } from "../elements";
 import { UserInputRequest } from "../../../types/types";
 
diff --git a/waveshell/pkg/shellapi/zshapi.go b/waveshell/pkg/shellapi/zshapi.go
index 2b4cdf841..ac8000cb9 100644
--- a/waveshell/pkg/shellapi/zshapi.go
+++ b/waveshell/pkg/shellapi/zshapi.go
@@ -257,10 +257,7 @@ func (z zshShellApi) MakeRcFileStr(pk *packet.RunPacketType) string {
 		}
 		rcBuf.WriteString("\n")
 	}
-	if shellenv.FindVarDecl(varDecls, "ZDOTDIR") == nil {
-		rcBuf.WriteString("unset ZDOTDIR\n")
-		rcBuf.WriteString("\n")
-	}
+	// do NOT unset ZDOTDIR, otherwise initialization will start to read initialization files from ~/ again
 	for _, varName := range ZshUnsetVars {
 		rcBuf.WriteString("unset " + shellescape.Quote(varName) + "\n")
 	}