diff --git a/README-MY-SETUP.md b/README-MY-SETUP.md
index c8fb0fb0a..7cddcaca7 100644
--- a/README-MY-SETUP.md
+++ b/README-MY-SETUP.md
@@ -86,14 +86,16 @@ Windows
     $ tar xvf zsh-5.9-2-x86_64.pkg.tar
     ```
 
-  * for `.bashrc` I prefer this entry so I can start the bash shell from zsh
+  * for `.bashrc` I prefer to append this entry so I can start the bash shell from zsh
 
     ```(shell)
+    /c/Windows/System32/chcp.com 65001 > /dev/null 2>&1
     if [ -t 1 ] && [ "$0" = "/usr/bin/bash" ]; then
       exec zsh
     fi
     ```
 
+  * `pip install thefuck`
   * continue with instructions to install Zsh
 * continue to [Common Install Steps](#common-install-steps)
 
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 30bc258a9..ed5abdfd3 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -70,33 +70,61 @@ COMPLETION_WAITING_DOTS="true"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(
-    alias-finder
-    aliases
-    aws
-    colored-man-pages
-    command-not-found
-    common-aliases
-    compleat
-    copybuffer
-    copyfile
-    copypath
-    dircycle
-    docker
-    emoji
-    extract
-    fasd
-    fd
-    git
-    jfrog
-    man
-    ssh-agent
-    thefuck
-    tmux
-    vscode
-    zsh-autosuggestions
-    zsh-interactive-cd
-)
+if [ "$MSYSTEM" = "MINGW64" ]; then
+    plugins=(
+        alias-finder
+        aliases
+        aws
+        colored-man-pages
+        command-not-found
+        common-aliases
+        compleat
+        copybuffer
+        copyfile
+        copypath
+        dircycle
+        docker
+        emoji
+        extract
+        fasd
+        fd
+        git
+        jfrog
+        man
+        ssh-agent
+        vscode
+        zsh-autosuggestions
+        zsh-interactive-cd
+    )
+else
+    plugins=(
+        alias-finder
+        aliases
+        aws
+        colored-man-pages
+        command-not-found
+        common-aliases
+        compleat
+        copybuffer
+        copyfile
+        copypath
+        dircycle
+        docker
+        emoji
+        extract
+        fasd
+        fd
+        git
+        jfrog
+        man
+        ssh-agent
+        thefuck
+        tmux
+        vscode
+        zsh-autosuggestions
+        zsh-interactive-cd
+    )
+fi
 
 zstyle :omz:plugins:ssh-agent agent-forwarding yes
 #zstyle :omz:plugins:ssh-agent helper ksshaskpass