diff --git a/background.html b/background.html
index 3902e358..caad89a6 100644
--- a/background.html
+++ b/background.html
@@ -307,22 +307,24 @@
     <button class='close'>&times;</button>
   </script>
   <script type='text/x-tmpl-mustache' id='debug-log'>
-    <a class='x close'>&times;</a>
-    <h1>{{ title }}</h1>
-    <p> {{ debugLogExplanation }}</p>
-    <form>
-      <textarea rows='5'></textarea>
-      <input class='submit' type='submit' value='{{ submit }}' />
-      <button class='close'>{{ cancel }}</button>
-    </form>
-    <div class='result'>
-      <a target='_blank'></a>
-      <div><button class='close'>{{ close }}</button></div>
+    <div class='content'>
+      <a class='x close'>&times;</a>
+      <h1>{{ title }}</h1>
+      <p> {{ debugLogExplanation }}</p>
+      <form>
+        <textarea rows='5'></textarea>
+        <input class='submit' type='submit' value='{{ submit }}' />
+        <button class='close'>{{ cancel }}</button>
+      </form>
+      <div class='result'>
+        <a target='_blank'></a>
+        <div><button class='close'>{{ close }}</button></div>
+      </div>
     </div>
   </script>
   <script type='text/x-tmpl-mustache' id='settings'>
     <div class='content'>
-      <div class='close'>x</div>
+      <a class='x close'>&times;</a>
       <h3>Notifications</h3>
       <div>
         <input type='radio' name='notifications' id='notification-setting-message' value='message'>
diff --git a/js/views/debug_log_view.js b/js/views/debug_log_view.js
index 7f3463dc..3ebece35 100644
--- a/js/views/debug_log_view.js
+++ b/js/views/debug_log_view.js
@@ -7,7 +7,7 @@
 
     Whisper.DebugLogView = Whisper.View.extend({
         templateName: 'debug-log',
-        className: 'debug-log',
+        className: 'debug-log modal',
         initialize: function() {
             this.render();
             this.$('textarea').val(console.get());
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 6372fc1e..340cbe2a 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -414,32 +414,12 @@ $avatar-size: 44px;
 }
 
 .debug-log {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  padding: 1em;
-  background: $grey_l;
-  z-index: 1;
-  overflow-y: auto;
+  &.modal .content {
+    max-width: 90%;
+  }
 
-  a.x {
-    display: inline-block;
-    float: right;
-    cursor: pointer;
-
-    font-family: sans-serif;
-    color: white;
-    border-radius: 50%;
-    width: 20px;
-    height: 20px;
-    padding: 0px;
-
-    background: #666;
-    color: #fff;
-    text-align: center;
-    font-size: 19px;
+  ::-webkit-scrollbar-thumb {
+    background: rgba(0,0,0,0.15);
   }
 
   textarea {
@@ -490,4 +470,22 @@ $avatar-size: 44px;
     overflow: auto;
     box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.2);
   }
+
+  a.x {
+    display: inline-block;
+    float: right;
+    cursor: pointer;
+
+    font-family: sans-serif;
+    color: white;
+    border-radius: 50%;
+    width: 20px;
+    height: 20px;
+    padding: 0px;
+
+    background: #666;
+    color: #fff;
+    text-align: center;
+    font-size: 19px;
+  }
 }
diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss
index b3146e8a..85e0892e 100644
--- a/stylesheets/_index.scss
+++ b/stylesheets/_index.scss
@@ -262,19 +262,3 @@ input.search {
     top: -30px;
   }
 }
-.settings {
-  .close {
-    float: right;
-    font-family: sans-serif;
-    color: white;
-    cursor: pointer;
-    border-radius: 50%;
-    width: 20px;
-    height: 20px;
-    padding: 0px;
-
-    background: #666;
-    color: #fff;
-    text-align: center;
-  }
-}
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 8e36a788..6de10822 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -328,50 +328,30 @@ img.emoji {
 @keyframes rotate {
   to {
     transform: rotate(360deg); } }
-.debug-log {
-  position: absolute;
+.debug-log.modal .content {
+  max-width: 90%; }
+.debug-log ::-webkit-scrollbar-thumb {
+  background: rgba(0, 0, 0, 0.15); }
+.debug-log textarea {
   width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
+  resize: vertical; }
+.debug-log button, .debug-log input[type=submit] {
+  border-radius: 4px;
+  border: solid 1px #ccc;
+  cursor: pointer;
+  margin: 1em auto;
   padding: 1em;
+  font-family: inherit;
+  color: #616161;
   background: #f3f3f3;
-  z-index: 1;
-  overflow-y: auto; }
-  .debug-log a.x {
-    display: inline-block;
-    float: right;
-    cursor: pointer;
-    font-family: sans-serif;
-    color: white;
-    border-radius: 50%;
-    width: 20px;
-    height: 20px;
-    padding: 0px;
-    background: #666;
-    color: #fff;
-    text-align: center;
-    font-size: 19px; }
-  .debug-log textarea {
-    width: 100%;
-    resize: vertical; }
-  .debug-log button, .debug-log input[type=submit] {
-    border-radius: 4px;
-    border: solid 1px #ccc;
-    cursor: pointer;
-    margin: 1em auto;
-    padding: 1em;
-    font-family: inherit;
-    color: #616161;
-    background: #f3f3f3;
-    box-shadow: 0 0 10px -5px rgba(97, 97, 97, 0.5); }
-    .debug-log button:hover, .debug-log input[type=submit]:hover {
-      color: black;
-      box-shadow: 0 0 10px -3px rgba(97, 97, 97, 0.7); }
-  .debug-log .result {
-    display: none;
-    text-align: center;
-    -webkit-user-select: text; }
+  box-shadow: 0 0 10px -5px rgba(97, 97, 97, 0.5); }
+  .debug-log button:hover, .debug-log input[type=submit]:hover {
+    color: black;
+    box-shadow: 0 0 10px -3px rgba(97, 97, 97, 0.7); }
+.debug-log .result {
+  display: none;
+  text-align: center;
+  -webkit-user-select: text; }
 
 .modal {
   position: absolute;
@@ -391,6 +371,20 @@ img.emoji {
     border-radius: 10px;
     overflow: auto;
     box-shadow: 0px 3px 5px 0px rgba(0, 0, 0, 0.2); }
+  .modal a.x {
+    display: inline-block;
+    float: right;
+    cursor: pointer;
+    font-family: sans-serif;
+    color: white;
+    border-radius: 50%;
+    width: 20px;
+    height: 20px;
+    padding: 0px;
+    background: #666;
+    color: #fff;
+    text-align: center;
+    font-size: 19px; }
 
 .gutter {
   padding: 36px 0 0; }
@@ -593,19 +587,6 @@ input.search {
     border-color: transparent transparent #2eace0 transparent;
     top: -30px; }
 
-.settings .close {
-  float: right;
-  font-family: sans-serif;
-  color: white;
-  cursor: pointer;
-  border-radius: 50%;
-  width: 20px;
-  height: 20px;
-  padding: 0px;
-  background: #666;
-  color: #fff;
-  text-align: center; }
-
 .conversation-title {
   display: block;
   line-height: 36px;