diff --git a/app/controllers/application.js b/app/controllers/application.js
index 1987a9b..cbd3e2c 100644
--- a/app/controllers/application.js
+++ b/app/controllers/application.js
@@ -1,5 +1,6 @@
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
+import { observer } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import { isEmpty } from '@ember/utils';
@@ -11,6 +12,7 @@ export default Controller.extend({
   connecting: alias('storage.connecting'),
   connected: alias('storage.connected'),
   rootListing: alias('storage.rootListing'),
+  currentDirPath: null,
 
   categories: function() {
     let categories = [];
@@ -28,8 +30,14 @@ export default Controller.extend({
     });
 
     return categories;
-  }.property('rootListing')
-
+  }.property('rootListing'),
 
+  connectedChange: observer('connected', function() {
+    if (this.get('connected')) {
+      // console.debug('connectedChange connected');
+    } else {
+      this.set('currentDirPath', null);
+    }
+  }),
 
 });
diff --git a/app/controllers/index.js b/app/controllers/index.js
index c2b2544..bf0946d 100644
--- a/app/controllers/index.js
+++ b/app/controllers/index.js
@@ -10,7 +10,6 @@ export default Controller.extend({
   application: controller(),
   storage: service(),
 
-  // connecting: alias('storage.connecting'),
   connected: alias('storage.connected'),
   rootListing: alias('storage.rootListing'),
   currentDirPath: alias('application.currentDirPath'),
@@ -29,7 +28,7 @@ export default Controller.extend({
     if (this.get('connected')) {
       // console.debug('connectedChange connected');
     } else {
-      this.set('model', {});
+      this.set('model', null);
       this.set('path', null);
     }
   }),