diff --git a/src/teleport-app.c b/src/teleport-app.c
index 6168ae9..d2e936b 100644
--- a/src/teleport-app.c
+++ b/src/teleport-app.c
@@ -215,6 +215,9 @@ mainLoopRemovePeerCallback (gpointer peer)  {
   GtkWidget *window = priv->window;
 
   update_remote_device_list_remove((TeleportWindow *) window, (Peer *) peer);
+  //if (teleport_peer_get_number (priv->peerList) == 0)
+  if (teleport_peer_get_number (priv->peerList) == 0)
+    teleport_show_no_device_message (TELEPORT_WINDOW (window));
   return G_SOURCE_REMOVE;
 }
 
diff --git a/src/teleport-peer.c b/src/teleport-peer.c
index 71d802b..4740e61 100644
--- a/src/teleport-peer.c
+++ b/src/teleport-peer.c
@@ -112,7 +112,8 @@ void teleport_peer_remove_peer (TeleportPeer *self, Peer *device)
   g_signal_emit (self, signalIds[REMOVE], 0, device);
 }
 
-void teleport_peer_remove_peer_by_name (TeleportPeer *self, const gchar *name)
+void
+teleport_peer_remove_peer_by_name (TeleportPeer *self, const gchar *name)
 {
   Peer *element = NULL;
   gboolean found = FALSE;
@@ -142,3 +143,8 @@ teleport_peer_get_name_by_addr (TeleportPeer *self, const gchar *addr)
   }
   return name;
 }
+int 
+teleport_peer_get_number (TeleportPeer *self)
+{
+  return (self->list->len);
+}
diff --git a/src/teleport-peer.h b/src/teleport-peer.h
index 1783c24..9a820ac 100644
--- a/src/teleport-peer.h
+++ b/src/teleport-peer.h
@@ -20,5 +20,6 @@ void teleport_peer_add_peer (TeleportPeer *self, gchar * name, gchar * ip, gint
 void teleport_peer_remove_peer (TeleportPeer *, Peer *);
 void teleport_peer_remove_peer_by_name (TeleportPeer *, const gchar *);
 gchar * teleport_peer_get_name_by_addr (TeleportPeer *, const gchar *);
+int  teleport_peer_get_number (TeleportPeer *self);
 
 #endif /* __TELEPORT_PEER_H */
diff --git a/src/teleport-window.c b/src/teleport-window.c
index ead94f7..d979109 100644
--- a/src/teleport-window.c
+++ b/src/teleport-window.c
@@ -192,6 +192,14 @@ teleport_get_download_directory (void)
   return g_settings_get_string (priv->settings, "download-dir");
 }
 
+void
+teleport_show_no_device_message (TeleportWindow *self)
+{
+  TeleportWindowPrivate *priv;
+  priv = teleport_window_get_instance_private (self);
+  gtk_widget_show (priv->remote_no_devices);
+}
+
 void
 teleport_window_open (TeleportWindow *win,
                       GFile *file)
diff --git a/src/teleport-window.h b/src/teleport-window.h
index a3f7bdc..7917618 100644
--- a/src/teleport-window.h
+++ b/src/teleport-window.h
@@ -22,5 +22,6 @@ void               update_remote_device_list_remove (TeleportWindow    *,
 
 gchar *            teleport_get_download_directory  (void); 
 gchar *            teleport_get_device_name         (void); 
+void               teleport_show_no_device_message  (TeleportWindow *);
 
 #endif /* __TELEPORT_WINDOW_H */