diff --git a/include/staff/templates/thread-event.tmpl.php b/include/staff/templates/thread-event.tmpl.php
index f98a1e3200776ca8727d586ee1dc47ead485540a..9792530714fb4db142d8aad63812e452a523ef4c 100644
--- a/include/staff/templates/thread-event.tmpl.php
+++ b/include/staff/templates/thread-event.tmpl.php
@@ -1,8 +1,10 @@
+<?php if ($desc = $event->getDescription(ThreadEvent::MODE_STAFF)) { ?>
 <div class="thread-event <?php if ($event->uid) echo 'action'; ?>">
         <span class="type-icon">
           <i class="faded icon-<?php echo $event->getIcon(); ?>"></i>
         </span>
         <span class="faded description">
-            <?php echo $event->getDescription(ThreadEvent::MODE_STAFF); ?>
+            <?php echo $desc; ?>
         </span>
 </div>
+<?php } ?>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 54ae700c322d68da3a5648b8bf9178b794ae1fc3..878333317fb1d3e17f90f6d87dab46254a3b00f9 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -3641,3 +3641,12 @@ img.avatar + img.avatar {
  */
 .select2-selection__rendered, .select2-search,
 .select2-search__field:not([placeholder='']){width: 100% !important;}
+/* Fix Canned Responses Select2 Height */
+#resp_sec .select2-results, #resp_sec .select2-results__choices {
+    height: auto;
+    max-height: 400px !important;
+}
+#select2-cannedResp-results {
+    height: auto;
+    max-height: 400px !important;
+}