diff --git a/developer/src/tike/xml/layoutbuilder/builder.xsl b/developer/src/tike/xml/layoutbuilder/builder.xsl
index 3b75cd81a3e..d43d90c5745 100644
--- a/developer/src/tike/xml/layoutbuilder/builder.xsl
+++ b/developer/src/tike/xml/layoutbuilder/builder.xsl
@@ -271,6 +271,10 @@
     </form>
   </div>
 
+  <div id='addPlatformDialogNoPlatformsToAdd' title='Add platform'>
+    <p>All available platforms have already been added.</p>
+  </div>
+
   <div id='addLayerDialog' title='Add layer'>
     <form>
       <fieldset>
diff --git a/developer/src/tike/xml/layoutbuilder/platform-controls.js b/developer/src/tike/xml/layoutbuilder/platform-controls.js
index 965513e69ce..bccb99717c5 100644
--- a/developer/src/tike/xml/layoutbuilder/platform-controls.js
+++ b/developer/src/tike/xml/layoutbuilder/platform-controls.js
@@ -5,14 +5,20 @@ $(function() {
     for (var platform in KVKL) {
       platforms[platform] = 0;
     }
+    let nPlatforms = 0;
     for (platform in platforms) {
       if (platforms[platform]) {
         var opt = document.createElement('option');
         $(opt).text(platform);
         $('#selAddPlatform').append(opt);
+        nPlatforms++;
       }
     }
-    $('#addPlatformDialog').dialog('open')
+    if(nPlatforms == 0) {
+      $('#addPlatformDialogNoPlatformsToAdd').dialog('open')
+    } else {
+      $('#addPlatformDialog').dialog('open')
+    }
   });
 
   $('#btnDelPlatform').click(function () {
@@ -69,6 +75,22 @@ $(function() {
     }
   });
 
+  //
+  // Platform dialog -- no platforms to add
+  //
+
+  $('#addPlatformDialogNoPlatformsToAdd').dialog({
+    autoOpen: false,
+    height: 150,
+    width: 350,
+    modal: true,
+    buttons: {
+      "OK": function () {
+        $(this).dialog('close');
+      }
+    }
+  });
+
   //
   // Platform Properties Dialog
   //