diff --git a/module2/ressources/rr_org/init.el b/module2/ressources/rr_org/init.el
index 12a552d0ed95036a0fc9ae9877a0307a1e0696ec..01b758661248c977b146cac2190c03ccfd7c13d4 100644
--- a/module2/ressources/rr_org/init.el
+++ b/module2/ressources/rr_org/init.el
@@ -232,8 +232,13 @@ Entered on %U
 (add-to-list 'org-structure-template-alist
         '("PP" "#+begin_src python :results file :session :var matplot_lib_filename=(org-babel-temp-file \"figure\" \".png\") :exports both\nimport matplotlib.pyplot as plt\n\nimport numpy\nx=numpy.linspace(-15,15)\nplt.figure(figsize=(10,5))\nplt.plot(x,numpy.cos(x)/x)\nplt.tight_layout()\n\nplt.savefig(matplot_lib_filename)\nmatplot_lib_filename\n#+end_src" "<src lang=\"python\">\n\n</src>"))
 
-(add-to-list 'org-structure-template-alist
-        '("b" "#+begin_src shell :results output :exports both\n\n#+end_src" "<src lang=\"sh\">\n\n</src>"))
+(if (memq system-type '(windows-nt ms-dos))
+    ;; Non-session shell execution does not seem to work under Windows, so we use
+    ;; a named session just like for B.
+    (add-to-list 'org-structure-template-alist
+                 '("b" "#+begin_src shell :session session :results output :exports both\n\n#+end_src" "<src lang=\"sh\">\n\n</src>"))
+  (add-to-list 'org-structure-template-alist
+               '("b" "#+begin_src shell :results output :exports both\n\n#+end_src" "<src lang=\"sh\">\n\n</src>")))
 
 (add-to-list 'org-structure-template-alist
         '("B" "#+begin_src shell :session *shell* :results output :exports both \n\n#+end_src" "<src lang=\"sh\">\n\n</src>"))
diff --git a/module2/ressources/rr_org/init.org b/module2/ressources/rr_org/init.org
index 3e94a68c5ecad65988bdac90eb7970d22d908196..60c3c6dd6ca3eba5c4c122419aa937459487bd53 100644
--- a/module2/ressources/rr_org/init.org
+++ b/module2/ressources/rr_org/init.org
@@ -395,8 +395,13 @@ To use this type <p and then TAB
 *** Bash "sh" code:
 To use this type <b and then TAB
 #+begin_src emacs-lisp :tangle init.el
-(add-to-list 'org-structure-template-alist
-        '("b" "#+begin_src shell :results output :exports both\n\n#+end_src" "<src lang=\"sh\">\n\n</src>"))
+(if (memq system-type '(windows-nt ms-dos))
+    ;; Non-session shell execution does not seem to work under Windows, so we use
+    ;; a named session just like for B.
+    (add-to-list 'org-structure-template-alist
+                 '("b" "#+begin_src shell :session session :results output :exports both\n\n#+end_src" "<src lang=\"sh\">\n\n</src>"))
+  (add-to-list 'org-structure-template-alist
+               '("b" "#+begin_src shell :results output :exports both\n\n#+end_src" "<src lang=\"sh\">\n\n</src>")))
 #+end_src
 
 To use this type <B and then TAB. This comes with a session argument