diff --git a/framework/core/js/forum/src/components/discussion-list-item.js b/framework/core/js/forum/src/components/discussion-list-item.js
index 8e0f58230..c8d2708aa 100644
--- a/framework/core/js/forum/src/components/discussion-list-item.js
+++ b/framework/core/js/forum/src/components/discussion-list-item.js
@@ -42,7 +42,7 @@ export default class DiscussionListItem extends Component {
         icon: 'ellipsis-v',
         items: controls,
         className: 'contextual-controls',
-        buttonClass: 'btn btn-link btn-icon btn-sm slidable-underneath slidable-underneath-right',
+        buttonClass: 'btn btn-default btn-naked btn-icon btn-sm slidable-underneath slidable-underneath-right',
         menuClass: 'pull-right'
       }) : '',
 
diff --git a/framework/core/js/forum/src/components/discussion-page.js b/framework/core/js/forum/src/components/discussion-page.js
index 9505d311f..58461a6cd 100644
--- a/framework/core/js/forum/src/components/discussion-page.js
+++ b/framework/core/js/forum/src/components/discussion-page.js
@@ -188,7 +188,7 @@ export default class DiscussionPage extends mixin(Component, evented) {
       $(document).off('mousemove', hotEdge);
     };
 
-    var $discussion = $index.find('.discussion-summary.active');
+    var $discussion = $index.find('.discussion-list-item.active');
     if ($discussion.length) {
       var indexTop = $index.offset().top;
       var discussionTop = $discussion.offset().top;
diff --git a/framework/core/less/forum/index.less b/framework/core/less/forum/index.less
index bcb2e87f7..a3fa65a4d 100644
--- a/framework/core/less/forum/index.less
+++ b/framework/core/less/forum/index.less
@@ -91,6 +91,9 @@
         &.active {
           background: @fl-body-control-bg;
         }
+        & .contextual-controls {
+          top: 5px;
+        }
       }
       & .discussion-summary {
         padding-left: 52px + 15px;
@@ -378,15 +381,15 @@
     padding-left: 15px;
     margin-left: -15px;
     border-radius: @border-radius-base;
-    transition: background 0.1s;
+    transition: background 0.2s;
 
     & .contextual-controls {
       position: absolute;
       right: 0;
-      top: 5px;
+      top: 15px;
       z-index: 1;
       opacity: 0;
-      transition: opacity 0.1s;
+      transition: opacity 0.2s;
 
       & .dropdown-toggle {
         display: block;