diff --git a/website/public/css/tasks.styl b/website/public/css/tasks.styl
index 5b1bbdc348..59ea60e0e7 100644
--- a/website/public/css/tasks.styl
+++ b/website/public/css/tasks.styl
@@ -142,6 +142,14 @@ for $stage in $stages
     padding: 0
     font-weight: 300
 
+.task-column.preview
+  padding: 0
+  background: transparent
+  border: 0;
+
+  .task:hover
+    cursor: auto
+
 // 50% width columns with scrollbars for tablets
 @media (min-width: 768px) and (max-width: 970px)
   .task-column
diff --git a/website/views/options/social/index.jade b/website/views/options/social/index.jade
index 0b41721987..a965b5d1d3 100644
--- a/website/views/options/social/index.jade
+++ b/website/views/options/social/index.jade
@@ -125,8 +125,20 @@ script(type='text/ng-template', id='modals/copyChatToDo.html')
 
     hr
 
-    div(popover-trigger='click', data-popover-html="{{notes | markdown}}", popover-placement="top")
-      +previewMarkdown('text')
+    div.task-column.preview
+      div(ng-init='popoverOpen = false', class='task todo uncompleted color-neutral', popover-trigger='mouseenter', data-popover-html="{{popoverOpen ? '' : notes | markdown}}", popover-placement="top")
+        // right-hand side control buttons
+        .task-meta-controls
+          // Icons only available if you own the tasks (aka, hidden from challenge stats)
+          span(ng-if='!obj._locked')
+            // notes
+            span.task-notes(ng-show='notes', ng-click='popoverOpen = !popoverOpen', popover-trigger='click', data-popover-html="{{notes | markdown}}", popover-placement="top")
+              span.glyphicon.glyphicon-comment
+              |  
+
+        // main content
+        div.task-text
+          markdown(text='text',target='_blank')
 
   .modal-footer
     button.btn.btn-default(ng-click='$close()')=env.t('close')
diff --git a/website/views/shared/tasks/task.jade b/website/views/shared/tasks/task.jade
index 09253f8f28..05661a939e 100644
--- a/website/views/shared/tasks/task.jade
+++ b/website/views/shared/tasks/task.jade
@@ -53,7 +53,7 @@ li(bindonce='list', id='task-{{::task.id}}', ng-repeat='task in obj[list.type+"s
         span.glyphicon.glyphicon-signal
         |  
       // notes
-      span.task-notes(ng-show='task.notes && !task._editing', ng-click='task.popoverOpen = !task.popoverOpen' popover-trigger='click', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}')
+      span.task-notes(ng-show='task.notes && !task._editing', ng-click='task.popoverOpen = !task.popoverOpen', popover-trigger='click', data-popover-html="{{task.notes | markdown}}", popover-placement="top", popover-append-to-body='{{::modal ? "false":"true"}}')
         span.glyphicon.glyphicon-comment
         |