diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java
index 687249568..22bc86f43 100644
--- a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java
+++ b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java
@@ -330,7 +330,7 @@ public void onBackPressed() {
         // Exit confirmed with 2xBack
         if (_doubleBackToExitPressedOnce) {
             super.onBackPressed();
-            _appSettings.setFileBrowserLastBrowsedFolder(_appSettings.getNotebookDirectory());
+            _appSettings.setFileBrowserLastBrowsedFolder(_notebook.getCurrentFolder());
             return;
         }
 
diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java
index 4a4440c4f..437854fbb 100644
--- a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java
+++ b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserDialog.java
@@ -21,6 +21,7 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -127,7 +128,7 @@ public void onViewCreated(final View root, final @Nullable Bundle savedInstanceS
         _toolBar.setTitleTextColor(rcolor(_dopt.titleTextColor));
         _toolBar.setTitle(_dopt.titleText);
         _toolBar.setSubtitleTextColor(rcolor(_dopt.secondaryTextColor));
-        _toolBar.setSubtitleTextAppearance(activity, R.style.TextAppearance_AppCompat_Subhead_Ellipsize);
+        setSubtitleApprearance(_toolBar);
 
         _homeButton.setImageResource(_dopt.homeButtonImage);
         _homeButton.setVisibility(_dopt.homeButtonEnable ? View.VISIBLE : View.GONE);
@@ -302,4 +303,30 @@ public void onStart() {
             w.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT);
         }
     }
+
+    private static void setSubtitleApprearance(final Toolbar toolbar) {
+        final String test = "__%%SUBTITLE%%__";
+        toolbar.setSubtitle(test);
+
+        for (int i = 0; i < toolbar.getChildCount(); i++) {
+            final View child = toolbar.getChildAt(i);
+            if (child instanceof TextView) {
+                final TextView tv = (TextView) child;
+                if (test.contentEquals(tv.getText())) {
+
+                    tv.setEllipsize(TextUtils.TruncateAt.START);
+                    tv.setSingleLine(true);
+                    final Toolbar.LayoutParams params = new Toolbar.LayoutParams(
+                            Toolbar.LayoutParams.MATCH_PARENT,
+                            Toolbar.LayoutParams.WRAP_CONTENT
+                    );
+                    tv.setLayoutParams(params);
+
+                    break;
+                }
+            }
+        }
+
+        toolbar.setSubtitle("");
+    }
 }
diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java
index 5ff6413bd..91539f132 100644
--- a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java
+++ b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java
@@ -525,7 +525,7 @@ public boolean goBack() {
     }
 
     public boolean canGoBack() {
-        return !_backStack.empty();
+        return !_backStack.isEmpty();
     }
 
     public boolean goUp() {
@@ -666,7 +666,7 @@ private void loadFolder(final File folder, final File show) {
         if (GO_BACK_SIGNIFIER == folder) {
             toLoad = _backStack.pop();
         } else {
-            if (folderChanged) {
+            if (folderChanged && _currentFolder != null) {
                 _backStack.push(_currentFolder);
             }
             toLoad = folder;
diff --git a/app/src/main/res/layout/opoc_filesystem_item.xml b/app/src/main/res/layout/opoc_filesystem_item.xml
index 7d927d4aa..189ec04fc 100644
--- a/app/src/main/res/layout/opoc_filesystem_item.xml
+++ b/app/src/main/res/layout/opoc_filesystem_item.xml
@@ -50,7 +50,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:ellipsize="middle"
+            android:ellipsize="start"
             android:importantForAccessibility="no"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Caption"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 552eaabd0..2de2590ac 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -76,9 +76,4 @@
         <item name="android:backgroundDimEnabled">true</item>
         <item name="colorAccent">@color/accent</item>
     </style>
-
-    <style name="TextAppearance.AppCompat.Subhead.Ellipsize" parent="TextAppearance.AppCompat.Subhead">
-        <item name="android:ellipsize">end</item>
-        <item name="android:cursorVisible">false</item>
-    </style>
 </resources>