diff --git a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java
index a4e192b6..0988ddfb 100644
--- a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java
+++ b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerActivity.java
@@ -116,6 +116,7 @@ protected abstract AbstractFilePickerFragment<T> getFragment(
 
     @Override
     public void onSaveInstanceState(Bundle b) {
+        b.putString("WORKAROUND_FOR_BUG_19917_KEY", "WORKAROUND_FOR_BUG_19917_VALUE");
         super.onSaveInstanceState(b);
     }
 
diff --git a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java
index 3597e0e6..75abfc59 100644
--- a/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java
+++ b/library/src/main/java/com/nononsenseapps/filepicker/AbstractFilePickerFragment.java
@@ -497,13 +497,13 @@ public boolean onOptionsItemSelected(MenuItem menuItem) {
 
     @Override
     public void onSaveInstanceState(Bundle b) {
-        super.onSaveInstanceState(b);
         b.putString(KEY_CURRENT_PATH, mCurrentPath.toString());
         b.putBoolean(KEY_ALLOW_MULTIPLE, allowMultiple);
         b.putBoolean(KEY_ALLOW_EXISTING_FILE, allowExistingFile);
         b.putBoolean(KEY_ALLOW_DIR_CREATE, allowCreateDir);
         b.putBoolean(KEY_SINGLE_CLICK, singleClick);
         b.putInt(KEY_MODE, mode);
+        super.onSaveInstanceState(b);
     }
 
     @Override