diff --git a/app/assets/javascripts/discourse/components/menu-panel.js.es6 b/app/assets/javascripts/discourse/components/menu-panel.js.es6
index 02304afee7f..604ec69d39d 100644
--- a/app/assets/javascripts/discourse/components/menu-panel.js.es6
+++ b/app/assets/javascripts/discourse/components/menu-panel.js.es6
@@ -155,8 +155,9 @@ export default Ember.Component.extend({
   @on('didInsertElement')
   _bindEvents() {
     this.$().on('click.discourse-menu-panel', 'a', e => {
-      if (e.metaKey) { return; }
-      if ($(e.target).data('ember-action')) { return; }
+      if (e.metaKey || e.ctrlKey || e.shiftKey) { return; }
+      const $target = $(e.target);
+      if ($target.data('ember-action') || $target.closest('.search-link').length > 0) { return; }
       this.hide();
     });
 
diff --git a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs
index 71b188ddf10..f89090ac24f 100644
--- a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs
@@ -1,12 +1,14 @@
 {{#each results as |result|}}
-  <a class='search-link' href='{{unbound result.urlWithNumber}}'>
-    <span class='topic'>
-      {{i18n 'search.post_format' post_number=result.post_number username=result.username}}
-    </span>
-    {{#unless site.mobileView}}
-      <span class='blurb'>
-      {{{unbound result.blurb}}}
+  <li>
+    <a class='search-link' href='{{unbound result.urlWithNumber}}'>
+      <span class='topic'>
+        {{i18n 'search.post_format' post_number=result.post_number username=result.username}}
       </span>
-    {{/unless}}
-  </a>
+      {{#unless site.mobileView}}
+        <span class='blurb'>
+        {{{unbound result.blurb}}}
+        </span>
+      {{/unless}}
+    </a>
+  </li>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs
index abdde5fbc49..70f4c910c3b 100644
--- a/app/assets/javascripts/discourse/templates/post.hbs
+++ b/app/assets/javascripts/discourse/templates/post.hbs
@@ -8,7 +8,7 @@
   {{view 'reply-history' content=replyHistory}}
 </div>
 
-<article class="boxed {{if via_email 'via-email'}}" id={{postElementId}} data-post-id={{id}} data-user-id={{user_id}}>
+<article class="boxed {{if via_email 'via-email'}}" id={{view.postElementId}} data-post-id={{id}} data-user-id={{user_id}}>
   <div class='row'>
 
     <div class='topic-avatar'>