diff --git a/framework/core/js/forum/src/initializers/boot.js b/framework/core/js/forum/src/initializers/boot.js
index 569ebccbc..5e3b55e20 100644
--- a/framework/core/js/forum/src/initializers/boot.js
+++ b/framework/core/js/forum/src/initializers/boot.js
@@ -21,12 +21,16 @@ export default function(app) {
   app.pane = new Pane(id('page'));
   app.cache = {};
 
-  app.signup = () => app.modal.show(new SignupModal());
-  app.login = () => app.modal.show(new LoginModal());
-
   m.mount(id('back-control'), BackButton.component({ className: 'back-control', drawer: true }));
   m.mount(id('back-button'), BackButton.component());
 
+  $('.global-content').click(e => {
+    if ($('body').hasClass('drawer-open')) {
+      e.preventDefault();
+      $('body').removeClass('drawer-open');
+    }
+  });
+
   m.mount(id('header-primary'), HeaderPrimary.component());
   m.mount(id('header-secondary'), HeaderSecondary.component());
   m.mount(id('footer-primary'), FooterPrimary.component());
diff --git a/framework/core/less/lib/layout.less b/framework/core/less/lib/layout.less
index b8f40598c..2a45bfc24 100644
--- a/framework/core/less/lib/layout.less
+++ b/framework/core/less/lib/layout.less
@@ -344,6 +344,12 @@ body {
 
     .drawer-open & {
       margin-left: @drawer-width;
+
+      // Disable all interaction with the content when the drawer is open. When
+      // .global-content is touched, the drawer will be closed.
+      & * {
+        pointer-events: none;
+      }
     }
   }
 }