diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java
index f9da4a232e9..abaaef0a143 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrBoxJsES6TestGenerated.java
@@ -3040,6 +3040,11 @@ public class IrBoxJsES6TestGenerated extends AbstractIrBoxJsES6Test {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/box/expression/when"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
             }
 
+            @TestMetadata("constantsInWhen.kt")
+            public void testConstantsInWhen() throws Exception {
+                runTest("js/js.translator/testData/box/expression/when/constantsInWhen.kt");
+            }
+
             @TestMetadata("doWhileWithOneStmWhen.kt")
             public void testDoWhileWithOneStmWhen() throws Exception {
                 runTest("js/js.translator/testData/box/expression/when/doWhileWithOneStmWhen.kt");
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java
index a77444a463c..38a61db9236 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrBoxJsTestGenerated.java
@@ -3040,6 +3040,11 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/box/expression/when"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
             }
 
+            @TestMetadata("constantsInWhen.kt")
+            public void testConstantsInWhen() throws Exception {
+                runTest("js/js.translator/testData/box/expression/when/constantsInWhen.kt");
+            }
+
             @TestMetadata("doWhileWithOneStmWhen.kt")
             public void testDoWhileWithOneStmWhen() throws Exception {
                 runTest("js/js.translator/testData/box/expression/when/doWhileWithOneStmWhen.kt");
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
index 99230958fb7..e29743ddeec 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/BoxJsTestGenerated.java
@@ -3055,6 +3055,11 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/box/expression/when"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS, true);
             }
 
+            @TestMetadata("constantsInWhen.kt")
+            public void testConstantsInWhen() throws Exception {
+                runTest("js/js.translator/testData/box/expression/when/constantsInWhen.kt");
+            }
+
             @TestMetadata("doWhileWithOneStmWhen.kt")
             public void testDoWhileWithOneStmWhen() throws Exception {
                 runTest("js/js.translator/testData/box/expression/when/doWhileWithOneStmWhen.kt");
diff --git a/js/js.translator/testData/box/expression/when/constantsInWhen.kt b/js/js.translator/testData/box/expression/when/constantsInWhen.kt
new file mode 100644
index 00000000000..bddece38b13
--- /dev/null
+++ b/js/js.translator/testData/box/expression/when/constantsInWhen.kt
@@ -0,0 +1,109 @@
+
+
+
+
+fun test(i: Int, j: Int, k: Int, episode: Boolean, ep2: Boolean = false): String {
+    return when (i) {
+        5 -> when (j) {
+            0 -> when (k) {
+                0 -> if (episode) "A" else "B"
+                1 -> if (episode) "C" else "D"
+                3 -> if (episode) "E" else "F"
+                else -> if (episode) "G" else "H"
+            }
+            1 -> when (k) {
+                0 -> if (episode) "I" else "J"
+                1 -> if (episode) "K" else "L"
+                3 -> if (episode) "M" else "N"
+                else -> if (episode) "O" else "P"
+            }
+            2 -> when (k) {
+                0 -> if (episode) "Q" else "R"
+                1 -> if (episode) "S" else "T"
+                3 -> if (episode) "U" else "V"
+                else -> if (episode) "W" else "X"
+            }
+            else -> if (episode) "Y" else "Z"
+        }
+        3 -> when (j) {
+            0 -> if (episode) "1" else if (ep2) "!" else "2"
+            1 -> if (episode) "3" else if (ep2) "?" else "4"
+            3 -> if (episode) "5" else if (ep2) "$" else "6"
+            else -> if (episode) "7" else if (ep2) "#" else "8"
+        }
+        else -> "9"
+    }
+}
+
+fun test2(i: Int, episode: Boolean): String {
+    return when (i) {
+
+        5 -> when (i % 3) {
+            0 -> if (episode) "FAIL3" else "FAIL2"
+            2 -> if (episode) "O" else "K"
+            else -> if (episode) "FAIL4" else "FAIL5"
+        }
+
+        else -> "FAIL1"
+    }
+}
+
+
+fun box(): String {
+    var result = ""
+
+    result += test(5, 0, 0, true)
+    result += test(5, 0, 0, false)
+    result += test(5, 0, 1, true)
+    result += test(5, 0, 1, false)
+    result += test(5, 0, 3, true)
+    result += test(5, 0, 3, false)
+    result += test(5, 0, 2, true)
+    result += test(5, 0, 2, false)
+
+    result += test(5, 1, 0, true)
+    result += test(5, 1, 0, false)
+    result += test(5, 1, 1, true)
+    result += test(5, 1, 1, false)
+    result += test(5, 1, 3, true)
+    result += test(5, 1, 3, false)
+    result += test(5, 1, 2, true)
+    result += test(5, 1, 2, false)
+
+    result += test(5, 2, 0, true)
+    result += test(5, 2, 0, false)
+    result += test(5, 2, 1, true)
+    result += test(5, 2, 1, false)
+    result += test(5, 2, 3, true)
+    result += test(5, 2, 3, false)
+    result += test(5, 2, 2, true)
+    result += test(5, 2, 2, false)
+
+    result += test(5, 3, 0, true)
+    result += test(5, 3, 0, false)
+    result += test(5, 3, 1, true)
+    result += test(5, 3, 1, false)
+    result += test(5, 3, 3, true)
+    result += test(5, 3, 3, false)
+    result += test(5, 3, 2, true)
+    result += test(5, 3, 2, false)
+
+    result += test(3, 0, -1, true)
+    result += test(3, 0, -1, false, true)
+    result += test(3, 0, -1, false, false)
+    result += test(3, 1, -1, true)
+    result += test(3, 1, -1, false, true)
+    result += test(3, 1, -1, false, false)
+    result += test(3, 2, -1, true)
+    result += test(3, 2, -1, false, true)
+    result += test(3, 2, -1, false, false)
+    result += test(3, 3, -1, true)
+    result += test(3, 3, -1, false, true)
+    result += test(3, 3, -1, false, false)
+
+    result += test(1, -1, -1, false)
+
+    if (result != "ABCDEFGHIJKLMNOPQRSTUVWXYZYZYZYZ1!23?47#85\$69") return "FAIL1: $result"
+
+    return test2(5, true) + test2(5, false)
+}
\ No newline at end of file