diff --git a/admin/calendar.php b/admin/calendar.php
index d17e0a71..2a0ae1f2 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -304,10 +304,18 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
     </div>
 </div>
 <div class="popover-template" style="display: none">
-    <div class="row">
-        <div class="col-md-6">
-            <i class="fa fa-clock"></i>
-            <p>00:00 - 00:00</p>
+    <div>
+        <div class="popover-location">
+            <strong>Location</strong>
+            <span></span>
+        </div>
+        <div class="popover-from">
+            <strong>From</strong>
+            <span></span>
+        </div>
+        <div class="popover-to">
+            <strong>To</strong>
+            <span></span>
         </div>
     </div>
 </div>
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index aad7fa0e..ebc34f96 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -91,22 +91,50 @@ $(document).ready(function() {
                 });
             }
         },
-        eventMouseover: function(event, jsEvent, view) {
-            $eventMarkup = $(this);
+        eventMouseover: function(event) {
+            if (event.type === 'TICKET') {
+                // Don't build a popover for tickets
+                return;
+            }
+
+            var contents = $('.popover-template').html();
+            $contents = $(contents);
+
+            var format = 'dddd, MMMM Do YYYY';
+            var endDate = event.end == null ? event.start : event.end;
+
+            if (!event.allDay) {
+                format += ', HH:mm';
+            }
+
+            if (event.location === '') {
+                $contents.find('.popover-location').hide();
+            }
+
+            $contents.find('.popover-location span').text(event.location).end()
+                .find('.popover-from span').text(event.start.format(format)).end()
+                .find('.popover-to span').text(endDate.format(format));
+            var $eventMarkup = $(this);
             $eventMarkup.popover({
                 title: event.title,
                 html: true,
-                content: $('.popover-template').html(),
+                content: $contents,
                 animation: true,
                 container: 'body',
                 placement: 'auto'
             }).popover('show');
         },
-        eventMouseout: function (event, jsEvent, view) {
+        eventMouseout: function (event) {
+            if (event.type === 'TICKET') {
+                // There's no popover to destroy
+                return;
+            }
+
             $(this).popover('destroy');
         }
     });
 
+
     $('#create-form input[name="all-day"]').change(function() {
         var hideTimeFields = $(this).is(':checked');