diff --git a/library/src/main/java/de/mrapp/android/preference/activity/PreferenceActivity.java b/library/src/main/java/de/mrapp/android/preference/activity/PreferenceActivity.java
index <HASH>..<HASH> 100644
--- a/library/src/main/java/de/mrapp/android/preference/activity/PreferenceActivity.java
+++ b/library/src/main/java/de/mrapp/android/preference/activity/PreferenceActivity.java
@@ -1680,7 +1680,8 @@ public abstract class PreferenceActivity extends AppCompatActivity
 
     @Override
     public final void onNavigationAdapterCreated() {
-        if (isSplitScreen() && navigationFragment.getNavigationPreferenceCount() > 0) {
+        if (navigationFragment.getNavigationPreferenceCount() > 0 &&
+                (isSplitScreen() || isButtonBarShown())) {
             navigationFragment.selectNavigationPreference(0, null);
         }
     }
The first navigation preference is now selected by default, when using the activity as a wizard.