diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4df28c..2f4b4cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Implemnted the initial work for integrating with GSettings and storing preferences. (Rowan Lewis)
 [!22](https://gitlab.gnome.org/alatiera/Hammond/merge_requests/22) [!23](https://gitlab.gnome.org/alatiera/Hammond/merge_requests/23)
 
+* Shows without episodes now display an empty message similar to EmptyView.
+[#44](https://gitlab.gnome.org/alatiera/Hammond/issues/44)
+
 ## [0.3.0] - 2018-02-11
 
 * Tobias Bernard Redesigned the whole Gtk+ client.
diff --git a/hammond-gtk/resources/gtk/empty_show.ui b/hammond-gtk/resources/gtk/empty_show.ui
new file mode 100644
index 0000000..c88fcb1
--- /dev/null
+++ b/hammond-gtk/resources/gtk/empty_show.ui
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.0 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkBox" id="empty_show">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="halign">center</property>
+    <property name="valign">center</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkImage">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="pixel_size">128</property>
+        <property name="icon_name">application-rss+xml-symbolic</property>
+        <property name="use_fallback">True</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">This show does not have any episodes</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+          <attribute name="scale" value="1.4399999999999999"/>
+        </attributes>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">If you think this is an Error, Plese consider opening a bug report.</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/hammond-gtk/resources/gtk/show_widget.ui b/hammond-gtk/resources/gtk/show_widget.ui
index e91316e..4f41060 100644
--- a/hammond-gtk/resources/gtk/show_widget.ui
+++ b/hammond-gtk/resources/gtk/show_widget.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.21.0 
+<!-- Generated with glade 3.22.0 
 
 Copyright (C) 2017 - 2018
 
@@ -37,6 +37,8 @@ Tobias Bernard
     <child>
       <object class="GtkScrolledWindow" id="scrolled_window">
         <property name="name">scrolled_window</property>
+        <property name="width_request">700</property>
+        <property name="height_request">500</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="hscrollbar_policy">never</property>
diff --git a/hammond-gtk/resources/resources.xml b/hammond-gtk/resources/resources.xml
index d3080b9..b8e1c75 100644
--- a/hammond-gtk/resources/resources.xml
+++ b/hammond-gtk/resources/resources.xml
@@ -4,6 +4,7 @@
       <file compressed="true" preprocess="xml-stripblanks">gtk/episode_widget.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/show_widget.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/empty_view.ui</file>
+      <file compressed="true" preprocess="xml-stripblanks">gtk/empty_show.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/episodes_view.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/episodes_view_widget.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/shows_view.ui</file>
diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs
index 3c202e5..f7a211e 100644
--- a/hammond-gtk/src/widgets/episode.rs
+++ b/hammond-gtk/src/widgets/episode.rs
@@ -354,15 +354,19 @@ pub fn episodes_listbox(pd: &Podcast, sender: Sender<Action>) -> Result<gtk::Lis
     let episodes = dbqueries::get_pd_episodeswidgets(pd)?;
 
     let list = gtk::ListBox::new();
+    list.set_visible(true);
+    list.set_selection_mode(gtk::SelectionMode::None);
+
+    if episodes.is_empty() {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/empty_show.ui");
+        let container: gtk::Box = builder.get_object("empty_show").unwrap();
+        list.add(&container);
+        return Ok(list);
+    }
 
     episodes.into_iter().for_each(|ep| {
         let widget = EpisodeWidget::new(ep, sender.clone());
         list.add(&widget.container);
     });
-
-    list.set_vexpand(false);
-    list.set_hexpand(false);
-    list.set_visible(true);
-    list.set_selection_mode(gtk::SelectionMode::None);
     Ok(list)
 }