diff --git a/panels/logbook/ha-logbook.html b/panels/logbook/ha-logbook.html
index 1afa54708e..77e072f143 100644
--- a/panels/logbook/ha-logbook.html
+++ b/panels/logbook/ha-logbook.html
@@ -58,7 +58,7 @@
             <span class='name'>[[item.name]]</span>
           </template>
           <template is='dom-if' if="[[item.entityId]]">
-            <a href='#' on-click="entityClicked" class='name'>[[item.name]]</a>
+            <a href='#' on-tap="entityClicked" class='name'>[[item.name]]</a>
           </template>
           <span> </span>
           <span>[[item.message]]</span>
@@ -82,5 +82,10 @@ Polymer({
       value: [],
     },
   },
+
+  entityClicked: function (ev) {
+    ev.preventDefault();
+    this.hass.moreInfoActions.selectEntity(ev.model.item.entityId);
+  }
 });
 </script>
diff --git a/panels/logbook/ha-panel-logbook.html b/panels/logbook/ha-panel-logbook.html
index 9ff57c7163..d35feb5651 100644
--- a/panels/logbook/ha-panel-logbook.html
+++ b/panels/logbook/ha-panel-logbook.html
@@ -72,17 +72,23 @@ Polymer({
 
     selectedDate: {
       type: String,
-      bindNuclear: function (hass) { return hass.logbookGetters.currentDate; },
+      bindNuclear: function (hass) {
+        return hass.logbookGetters.currentDate;
+      },
     },
 
     isLoading: {
       type: Boolean,
-      bindNuclear: function (hass) { return hass.logbookGetters.isLoadingEntries; },
+      bindNuclear: function (hass) {
+        return hass.logbookGetters.isLoadingEntries;
+      },
     },
 
     isStale: {
       type: Boolean,
-      bindNuclear: function (hass) { return hass.logbookGetters.isCurrentStale; },
+      bindNuclear: function (hass) {
+        return hass.logbookGetters.isCurrentStale;
+      },
       observer: 'isStaleChanged',
     },
 
@@ -114,7 +120,7 @@ Polymer({
   },
 
   datepickerFocus: function () {
-    // this.datePicker.adjustPosition();
+    this.datePicker.adjustPosition();
   },
 
   attached: function () {