diff --git a/app/assets/javascripts/design_management/index.js b/app/assets/javascripts/design_management/index.js
index 63e59f816d704dd8fd43378a5aa64072128690f7..f0b02d07d93f0bc66743010a28c5ac3f95cdd4db 100644
--- a/app/assets/javascripts/design_management/index.js
+++ b/app/assets/javascripts/design_management/index.js
@@ -7,7 +7,7 @@ import getDesignListQuery from './graphql/queries/get_design_list.query.graphql'
 import { DESIGNS_ROUTE_NAME, ROOT_ROUTE_NAME } from './router/constants';
 
 export default () => {
-  const el = document.getElementById('js-design-management');
+  const el = document.querySelector('.js-design-management');
   const badge = document.querySelector('.js-designs-count');
   const { issueIid, projectPath, issuePath } = el.dataset;
   const router = createRouter(issuePath);
diff --git a/app/assets/javascripts/pages/projects/issues/show.js b/app/assets/javascripts/pages/projects/issues/show.js
index 75df80a0f6c5bd68928e598e5aac2a42a37d216d..46c9b2fe0af0e9a9f17e8aa8783d038c635fab05 100644
--- a/app/assets/javascripts/pages/projects/issues/show.js
+++ b/app/assets/javascripts/pages/projects/issues/show.js
@@ -12,6 +12,16 @@ export default function() {
   initIssueableApp();
   initSentryErrorStackTraceApp();
   initRelatedMergeRequestsApp();
+
+  // .js-design-management is currently EE-only.
+  // This will be moved to CE as part of https://gitlab.com/gitlab-org/gitlab/-/issues/212566#frontend
+  // at which point this conditional can be removed.
+  if (document.querySelector('.js-design-management')) {
+    import(/* webpackChunkName: 'design_management' */ '~/design_management')
+      .then(module => module.default())
+      .catch(() => {});
+  }
+
   new Issue(); // eslint-disable-line no-new
   new ShortcutsIssuable(); // eslint-disable-line no-new
   new ZenMode(); // eslint-disable-line no-new
diff --git a/ee/app/assets/javascripts/pages/projects/issues/show/index.js b/ee/app/assets/javascripts/pages/projects/issues/show/index.js
index 0f8e0aca79702535f37117a4cbee09bf99ebaa56..48de8ed3c659ffcae51bc66ba17aa5d1e6ceb4b1 100644
--- a/ee/app/assets/javascripts/pages/projects/issues/show/index.js
+++ b/ee/app/assets/javascripts/pages/projects/issues/show/index.js
@@ -10,12 +10,6 @@ document.addEventListener('DOMContentLoaded', () => {
   }
   initRelatedIssues();
 
-  if (document.getElementById('js-design-management')) {
-    import(/* webpackChunkName: 'design_management' */ '~/design_management')
-      .then(module => module.default())
-      .catch(() => {});
-  }
-
   // eslint-disable-next-line no-new
   new UserCallout({ className: 'js-epics-sidebar-callout' });
   // eslint-disable-next-line no-new
diff --git a/ee/app/views/projects/issues/_discussion.html.haml b/ee/app/views/projects/issues/_discussion.html.haml
index 99dbb2b4373690bf3fd4377190c5ec9470958708..e0711912b9e880fb92ac6316353f6dd2d5691bc1 100644
--- a/ee/app/views/projects/issues/_discussion.html.haml
+++ b/ee/app/views/projects/issues/_discussion.html.haml
@@ -12,7 +12,7 @@
     = render_ce 'projects/issues/discussion'
   #designs-tab.tab-pane{ role: 'tabpanel', 'aria-labelledby': 'designs', data: { qa_selector: 'designs_tab_content'} }
     - if @project.design_management_enabled?
-      #js-design-management{ data: { project_path: @project.full_path, issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue) } }
+      .js-design-management{ data: { project_path: @project.full_path, issue_iid: @issue.iid, issue_path: project_issue_path(@project, @issue) } }
     - else
       .mt-4
         .row.empty-state