diff --git a/src/containers/PinnedManager/PinnedManager.js b/src/containers/PinnedManager/PinnedManager.js
index d2d5ef2..6682d45 100644
--- a/src/containers/PinnedManager/PinnedManager.js
+++ b/src/containers/PinnedManager/PinnedManager.js
@@ -34,7 +34,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(class extends IPCCon
   state = {
     active_directory: '/',
     items: [],
-    previous_directory: '',
+    previous: [],
   }
 
   componentDidMount() {
@@ -89,11 +89,16 @@ export default connect(mapStateToProps, mapDispatchToProps)(class extends IPCCon
       <div key={'dir_' + idx} style={{...style}}>
         <Button buttonStyles={{textAlign: 'left'}}
                 clicked={() => {
-                  const current_path = path === '..' ? '' : this.state.active_directory;
+                  const previous = [...this.state.previous];
+                  if (path === '..') {
+                    path = previous.pop();
+                  } else {
+                    previous.push(this.state.active_directory);
+                  }
                   this.setState({
                     items: [],
-                    active_directory: path === '..' ? this.state.previous_directory : path,
-                    previous_directory: current_path,
+                    active_directory: path,
+                    previous,
                   }, () => {
                     this.grabDirectoryItems();
                   });
diff --git a/src/renderer/ipc/StateIPC.js b/src/renderer/ipc/StateIPC.js
index b8fcd05..b1858f9 100644
--- a/src/renderer/ipc/StateIPC.js
+++ b/src/renderer/ipc/StateIPC.js
@@ -3,10 +3,15 @@ const fs = require('fs');
 const helpers = require('../../helpers');
 const path = require('path');
 
-const getDirectories = source =>
-  fs.readdirSync(source, {withFileTypes: true})
-  .filter(dirent => dirent.isDirectory())
-  .map(dirent => dirent.name)
+const getDirectories = source => {
+  try {
+    return fs.readdirSync(source, {withFileTypes: true})
+    .filter(dirent => dirent.isDirectory())
+    .map(dirent => dirent.name);
+  } catch {
+    return [];
+  }
+}
 
 const addListeners = ipcMain => {
   ipcMain.on(Constants.IPC_Get_State, event => {