diff --git a/src/haz3lweb/view/editor/CodeEditor.re b/src/haz3lweb/view/editor/CodeEditor.re
index 6fb319321a..c7d54946f7 100644
--- a/src/haz3lweb/view/editor/CodeEditor.re
+++ b/src/haz3lweb/view/editor/CodeEditor.re
@@ -139,6 +139,7 @@ module View = {
       ~attr=
         Attr.many([
           Attr.classes(["cell-item"]),
+          Attr.classes(["code-editor"]),
           Attr.on_mousedown(on_mousedown),
         ]),
       mousedown_overlay @ [code_view],
diff --git a/src/haz3lweb/www/style.css b/src/haz3lweb/www/style.css
index f908c3a5d9..1d50c7edae 100644
--- a/src/haz3lweb/www/style.css
+++ b/src/haz3lweb/www/style.css
@@ -362,7 +362,7 @@ body {
   width: auto;
 }
 
-#main .code-container {
+#main .code-editor {
   cursor: text;
 }
 
@@ -386,6 +386,7 @@ select {
   font-family: "Source Code Pro", monospace;
   font-weight: normal;
   font-size: 13pt;
+  pointer-events: none;
 }
 
 #editor-mode,
@@ -2370,4 +2371,9 @@ svg.expandable path {
 
 .tile-next-step .tile-path.Exp.indicated {
   fill: #8aeda6;
+}
+
+svg.tile-next-step {
+  pointer-events: all;
+  cursor: pointer;
 }
\ No newline at end of file