diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index ae6b09330..51d971c3c 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -2767,6 +2767,7 @@ Other:
 - Added ENSIME jump handlers (thanks to Joao Azevedo)
 - Added scala-lsp and metals as an additional backend for scala
   (thanks to Rodolfo Hansen)
+- Disabled =sbt-supershell= in =sbt-mode= (thanks to Rodolfo Hansen)
 **** Scheme
 - Added missing =parinfer= package declaration (thanks to Kalle Lindqvist)
 - Update install docs for Chicken 5 changes (thanks to Grant Shangreaux)
diff --git a/layers/+lang/scala/packages.el b/layers/+lang/scala/packages.el
index a818eaf05..e0d673f1f 100644
--- a/layers/+lang/scala/packages.el
+++ b/layers/+lang/scala/packages.el
@@ -186,6 +186,8 @@
      'minibuffer-complete-word
      'self-insert-command
      minibuffer-local-completion-map)
+    ;; sbt-supershell kills sbt-mode:  https://github.com/hvesalai/emacs-sbt-mode/issues/152
+    (setq sbt:program-options '("-Dsbt.supershell=false"))
     :init
     (progn
       (spacemacs/declare-prefix-for-mode 'scala-mode "mb" "sbt")