diff --git a/developer/src/tike/xml/layoutbuilder/builder.js b/developer/src/tike/xml/layoutbuilder/builder.js
index b81707fa3ca..486bce81f9e 100644
--- a/developer/src/tike/xml/layoutbuilder/builder.js
+++ b/developer/src/tike/xml/layoutbuilder/builder.js
@@ -508,8 +508,16 @@ $(function() {
 
   this.selectLayer = function (val) {
     let selection = builder.saveSelection();
-    if(val) $('#selLayer').val(val);
+    if(val !== null && val !== undefined) {
+      $('#selLayer').val(val);
+    }
     builder.lastLayerIndex = $('#selLayer').val();
+    if(builder.lastLayerIndex === null) {
+      // If the layer has just been deleted, go to the first layer
+      builder.lastLayerIndex = 0;
+      builder.lastLayers[builder.lastPlatform] = 0;
+      $('#selLayer').val(builder.lastLayerIndex);
+    }
     builder.prepareLayer();
     builder.restoreSelection(selection);
   }
diff --git a/developer/src/tike/xml/layoutbuilder/layer-controls.js b/developer/src/tike/xml/layoutbuilder/layer-controls.js
index 765aa5c2bd1..e1cf11ac34d 100644
--- a/developer/src/tike/xml/layoutbuilder/layer-controls.js
+++ b/developer/src/tike/xml/layoutbuilder/layer-controls.js
@@ -64,7 +64,7 @@ $(function() {
                 key.sk.forEach(k => fixup(k));
               }
               if (key.flick) {
-                key.flick.forEach(k => fixup(k));
+                Object.keys(key.flick).forEach(k => fixup(key.flick[k]));
               }
               if (key.multitap) {
                 key.multitap.forEach(k => fixup(k));