diff --git a/src/calls-main-window.c b/src/calls-main-window.c
index 2065ba1..8a9d4a2 100644
--- a/src/calls-main-window.c
+++ b/src/calls-main-window.c
@@ -59,7 +59,6 @@ struct _CallsMainWindow
   HdyDialer *dial_pad;
 
   GtkListStore *origin_store;
-  GtkListStore *history_store;
 };
 
 enum {
@@ -730,7 +729,6 @@ calls_main_window_class_init (CallsMainWindowClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, search);
   gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, dial_pad);
   gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, origin_store);
-  gtk_widget_class_bind_template_child (widget_class, CallsMainWindow, history_store);
   gtk_widget_class_bind_template_callback (widget_class, info_response_cb);
   gtk_widget_class_bind_template_callback (widget_class, new_call_expanded_notify_cb);
   gtk_widget_class_bind_template_callback (widget_class, call_selector_child_activated_cb);
diff --git a/src/main.c b/src/main.c
index 591ea68..f593b1d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,6 +28,7 @@
 #include <handy.h>
 
 #include "calls-encryption-indicator.h"
+#include "calls-history-box.h"
 #include "calls-main-window.h"
 #include "calls-mm-provider.h"
 
@@ -40,6 +41,7 @@ show_window (GtkApplication *app)
   CallsMainWindow *main_window;
 
   CALLS_TYPE_ENCRYPTION_INDICATOR;
+  CALLS_TYPE_HISTORY_BOX;
   HDY_TYPE_DIALER;
 
   connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
diff --git a/src/ui/history-box.ui b/src/ui/history-box.ui
index 8ecad28..5de67f4 100644
--- a/src/ui/history-box.ui
+++ b/src/ui/history-box.ui
@@ -6,7 +6,7 @@
   <object class="GtkListStore" id="history_store"/>
   <template class="CallsHistoryBox" parent="GtkTreeView">
     <property name="can_focus">False</property>
-      <property name="model">history_store</property>
+    <property name="model">history_store</property>
     <property name="visible">True</property>
     <child internal-child="selection">
       <object class="GtkTreeSelection"/>
diff --git a/src/ui/main-window.ui b/src/ui/main-window.ui
index 8968372..949157a 100644
--- a/src/ui/main-window.ui
+++ b/src/ui/main-window.ui
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <requires lib="libhandy" version="0.0"/>
-  <object class="GtkListStore" id="history_store"/>
   <object class="GtkListStore" id="origin_store">
     <columns>
       <!-- column-name name -->
@@ -259,13 +258,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkTreeView" id="history_view">
+              <object class="CallsHistoryBox" id="history_view">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="model">history_store</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection"/>
-                </child>
               </object>
               <packing>
                 <property name="name">history</property>