diff --git a/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java b/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java
index acb116138..d23862669 100644
--- a/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java
@@ -18,6 +18,7 @@
 
 package org.fdroid.fdroid;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.NavUtils;
@@ -44,7 +45,9 @@ public class PreferencesActivity extends ActionBarActivity {
             // a (bug?) thing in 3.0, 3.1 which requires setContentView to be invoked before
             // the actionbar is played with:
             // http://blog.perpetumdesign.com/2011/08/strange-case-of-dr-action-and-mr-bar.html
-            setContentView(new LinearLayout(this));
+            if (Build.VERSION.SDK_INT >= 11 && Build.VERSION.SDK_INT <= 13) {
+                setContentView(new LinearLayout(this));
+            }
 
             PreferencesFragment preferencesFragment = new PreferencesFragment();
             fm.beginTransaction()
diff --git a/F-Droid/src/org/fdroid/fdroid/SearchResults.java b/F-Droid/src/org/fdroid/fdroid/SearchResults.java
index 766b06f22..9f3bf0cff 100644
--- a/F-Droid/src/org/fdroid/fdroid/SearchResults.java
+++ b/F-Droid/src/org/fdroid/fdroid/SearchResults.java
@@ -19,6 +19,7 @@
 package org.fdroid.fdroid;
 
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.NavUtils;
@@ -50,7 +51,9 @@ public class SearchResults extends ActionBarActivity {
             // a (bug?) thing in 3.0, 3.1 which requires setContentView to be invoked before
             // the actionbar is played with:
             // http://blog.perpetumdesign.com/2011/08/strange-case-of-dr-action-and-mr-bar.html
-            setContentView(new LinearLayout(this));
+            if (Build.VERSION.SDK_INT >= 11 && Build.VERSION.SDK_INT <= 13) {
+                setContentView(new LinearLayout(this));
+            }
 
             SearchResultsFragment fragment = new SearchResultsFragment();
             fm.beginTransaction().add(android.R.id.content, fragment).commit();
diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
index c4ffbc17d..3dd57dda1 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java
@@ -31,6 +31,7 @@ import android.net.Uri;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentManager;
@@ -125,7 +126,9 @@ public class ManageReposActivity extends ActionBarActivity {
              * http://blog.perpetumdesign.com/2011/08/strange-case-of
              * -dr-action-and-mr-bar.html
              */
-            setContentView(new LinearLayout(this));
+            if (Build.VERSION.SDK_INT >= 11 && Build.VERSION.SDK_INT <= 13) {
+                setContentView(new LinearLayout(this));
+            }
 
             fm.beginTransaction()
                     .add(android.R.id.content, new RepoListFragment())
diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
index 67c3b90a6..fac348d14 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java
@@ -43,7 +43,9 @@ public class RepoDetailsActivity extends ActionBarActivity {
             // a (bug?) thing in 3.0, 3.1 which requires setContentView to be invoked before
             // the actionbar is played with:
             // http://blog.perpetumdesign.com/2011/08/strange-case-of-dr-action-and-mr-bar.html
-            setContentView(new LinearLayout(this));
+            if (Build.VERSION.SDK_INT >= 11 && Build.VERSION.SDK_INT <= 13) {
+                setContentView(new LinearLayout(this));
+            }
 
             RepoDetailsFragment fragment = new RepoDetailsFragment();
             fragment.setArguments(getIntent().getExtras());