diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index d1fff2d05..55aa05a65 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -288,12 +288,26 @@ EndSessionDialog.prototype = {
         this.contentLayout.add(scrollView,
                                { x_fill: true,
                                  y_fill: true });
+        scrollView.hide();
+
         this._applicationList = new St.BoxLayout({ vertical: true });
         scrollView.add_actor(this._applicationList,
                              { x_fill:  true,
                                y_fill:  true,
                                x_align: St.Align.START,
                                y_align: St.Align.MIDDLE });
+
+        this._applicationList.connect('actor-added',
+                                      Lang.bind(this, function() {
+                                          if (this._applicationList.get_children().length == 1)
+                                              scrollView.show();
+                                      }));
+
+        this._applicationList.connect('actor-removed',
+                                      Lang.bind(this, function() {
+                                          if (this._applicationList.get_children().length == 0)
+                                              scrollView.hide();
+                                      }));
     },
 
     _onDestroy: function() {