diff --git a/packages/builder/src/userInterface/CodeEditor.svelte b/packages/builder/src/userInterface/CodeEditor.svelte
index dbe87d8eff..68719a52a3 100644
--- a/packages/builder/src/userInterface/CodeEditor.svelte
+++ b/packages/builder/src/userInterface/CodeEditor.svelte
@@ -33,7 +33,7 @@ $: {
       cmInstance.on("change", () => currentCode = cmInstance.getValue());
     }
     cmInstance.focus();
-    cmInstance.setValue(code);
+    cmInstance.setValue(code || "");
   }
 }
 
diff --git a/packages/builder/src/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/userInterface/ComponentsPaneSwitcher.svelte
index 7877bee626..a9a373eb06 100644
--- a/packages/builder/src/userInterface/ComponentsPaneSwitcher.svelte
+++ b/packages/builder/src/userInterface/ComponentsPaneSwitcher.svelte
@@ -67,6 +67,7 @@
     font-size: 0.85rem;
     text-transform: uppercase;
     color: #999;
+    background-color: rgba(0,0,0,0);
 }
 
 .switcher > .selected {
diff --git a/packages/builder/src/userInterface/PropControl.svelte b/packages/builder/src/userInterface/PropControl.svelte
index 779ebbecfb..013ab55554 100644
--- a/packages/builder/src/userInterface/PropControl.svelte
+++ b/packages/builder/src/userInterface/PropControl.svelte
@@ -41,6 +41,7 @@
     }
 
     h5 {
+        word-wrap: break-word;
         font-size: 12px;
         font-weight: 700;
         color: #163057;