diff --git a/src/css/dialogs-browse-backups.css b/src/css/dialogs-browse-backups.css
index f846ec94..ae66f5b3 100644
--- a/src/css/dialogs-browse-backups.css
+++ b/src/css/dialogs-browse-backups.css
@@ -56,6 +56,21 @@
   height: 90px;
 }
 
+.browse-backups .session-list-empty,
+.browse-backups .snapshot-list-empty {
+  position: absolute;
+  left: 50%;
+  width: 200px;
+  margin-top: 100px;
+  margin-left: -130px;
+  padding: 30px;
+
+  font-size: 16px;
+  text-align: center;
+  border: 1px solid;
+  color: #bbb;
+}
+
 .browse-backups .session-item {
   transition: all 500ms;
 }
diff --git a/src/js/controller/dialogs/backups/steps/SelectSession.js b/src/js/controller/dialogs/backups/steps/SelectSession.js
index 97ad5542..a66f1785 100644
--- a/src/js/controller/dialogs/backups/steps/SelectSession.js
+++ b/src/js/controller/dialogs/backups/steps/SelectSession.js
@@ -39,7 +39,7 @@
     pskl.app.backupService.list().then(function (sessions) {
       var html = '';
       if (sessions.length === 0) {
-        html = 'No session found ...';
+        html = pskl.utils.Template.get('session-list-empty');
       } else {
         var sessionItemTemplate = pskl.utils.Template.get('session-list-item');
         var html = '';
diff --git a/src/js/controller/dialogs/backups/steps/SessionDetails.js b/src/js/controller/dialogs/backups/steps/SessionDetails.js
index cadc5ae7..d84f7d7f 100644
--- a/src/js/controller/dialogs/backups/steps/SessionDetails.js
+++ b/src/js/controller/dialogs/backups/steps/SessionDetails.js
@@ -26,7 +26,10 @@
     pskl.app.backupService.getSnapshotsBySessionId(sessionId).then(function (snapshots) {
       var html = '';
       if (snapshots.length === 0) {
-        html = 'No snapshot found...';
+        // This should normally never happen, all sessions have at least one snapshot and snapshots
+        // can not be individually deleted.
+        console.warn('Could not retrieve snapshots for a session');
+        html = pskl.utils.Template.get('snapshot-list-empty');
       } else {
         var sessionItemTemplate = pskl.utils.Template.get('snapshot-list-item');
         var html = '';
diff --git a/src/templates/dialogs/browse-backups.html b/src/templates/dialogs/browse-backups.html
index 8c37e805..06455fa3 100644
--- a/src/templates/dialogs/browse-backups.html
+++ b/src/templates/dialogs/browse-backups.html
@@ -27,6 +27,10 @@
 </div>
 </script>
 
+<script type="text/template" id="session-list-empty">
+<div class="session-list-empty">No session found ...</div>
+</script>
+
 <script type="text/template" id="session-list-item">
 <div class="session-item">
   <div class="session-details">
@@ -52,6 +56,10 @@
 </div>
 </script>
 
+<script type="text/template" id="snapshot-list-empty">
+<div class="snapshot-list-empty">No snapshot found ...</div>
+</script>
+
 <script type="text/template" id="snapshot-list-item">
 <div class="snapshot-item">
   <div class="snapshot-details">