diff --git a/builder/builder.html b/builder/builder.html
index 65b2f9e..e0347c4 100644
--- a/builder/builder.html
+++ b/builder/builder.html
@@ -271,7 +271,10 @@ <h4 class="modal-title" id="modal-enter-code-label">Enter a Team unique code</h4
           $(".btn-unselect-supreme").click(function() { unselect_supreme(getSupremeId("btn-unselect-supreme-", $(this).attr('id')), true); });
 		  $('#btnHideSelectionFooter').click(function() { hide_selection_footer(); });
           $('#btnShowSelectionFooter').click(function() { show_selection_footer(); });
-		  $(".supreme-selection").click(function() { toggle_selection_footer(getSupremeId("supreme-selection-", $(this).attr('id'))); });
+		  $(".supreme-selection > .header").click(function() 
+          { 
+            toggle_selection_footer(getSupremeId("supreme-selection-", $(this).parent().attr('id'))); 
+          });
           supremesModalFilled = true;
           load_code_from_url();
         },
@@ -691,6 +694,8 @@ <h4 class="modal-title" id="modal-enter-code-label">Enter a Team unique code</h4
 
 function getSupremeId(strStartId, strId)
 {
+  if (strId === undefined)
+    return 0;
   return strId.substring(strStartId.length);
 }