diff --git a/libsrc/telestrat/initcwd.s b/libsrc/telestrat/initcwd.s
index dc3c53257..7d38dd563 100644
--- a/libsrc/telestrat/initcwd.s
+++ b/libsrc/telestrat/initcwd.s
@@ -10,8 +10,7 @@
 
 
 initcwd:
-        ldx     #PWD_PTR
-        BRK_TELEMON XVARS
+        BRK_TELEMON(XGETCWD)
 
         sta     ptr1
         sty     ptr1+1
diff --git a/libsrc/telestrat/syschdir.s b/libsrc/telestrat/syschdir.s
index 37ee0cc81..2437ac80e 100644
--- a/libsrc/telestrat/syschdir.s
+++ b/libsrc/telestrat/syschdir.s
@@ -7,6 +7,7 @@
         .export         __syschdir
         .import         addysp, popax
 		.importzp       tmp1
+        .import         initcwd
 
         .include        "telestrat.inc"
         .include        "zeropage.inc"
@@ -27,5 +28,7 @@ __syschdir:
         ; Call telemon primitive
         
         BRK_TELEMON(XPUTCWD)
+
+        jsr     initcwd      ; Update cwd
         
         rts