diff --git a/static/js/utils/modal.js b/static/js/utils/modal.js
index 3f46300a6..7a5c49543 100644
--- a/static/js/utils/modal.js
+++ b/static/js/utils/modal.js
@@ -76,10 +76,14 @@
     }
 
     function setupTrigger() {
-      var triggerElement = document.querySelector(element.dataset.modalTrigger);
+      var triggerSelector = element.dataset.modalTrigger;
+      if (!triggerSelector.startsWith('#')) {
+        triggerSelector = '#' + triggerSelector;
+      }
+      var triggerElement = document.querySelector(triggerSelector);
 
       if (!triggerElement) {
-        throw new Error('Trigger element for Modal not found: "', + element.dataset.modalTrigger + '"');
+        throw new Error('Trigger element for Modal not found: "' + triggerSelector + '"');
       }
 
       triggerElement.classList.add(MODAL_TRIGGER_CLASS);