diff --git a/DroidFishApp/src/main/AndroidManifest.xml b/DroidFishApp/src/main/AndroidManifest.xml
index 2104a0e..909f9d4 100644
--- a/DroidFishApp/src/main/AndroidManifest.xml
+++ b/DroidFishApp/src/main/AndroidManifest.xml
@@ -94,7 +94,8 @@
             </intent-filter>
             </activity>
         <activity android:name=".activities.Preferences"
-                  android:label="@string/preferences">
+                  android:label="@string/preferences"
+                  android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize">
         </activity>
         <activity android:name=".activities.EditBoard"
                   android:label="@string/edit_board"
diff --git a/DroidFishApp/src/main/java/org/petero/droidfish/activities/Preferences.java b/DroidFishApp/src/main/java/org/petero/droidfish/activities/Preferences.java
index c85dd91..d9188b4 100644
--- a/DroidFishApp/src/main/java/org/petero/droidfish/activities/Preferences.java
+++ b/DroidFishApp/src/main/java/org/petero/droidfish/activities/Preferences.java
@@ -26,6 +26,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
@@ -105,6 +106,11 @@ public class Preferences extends PreferenceActivity {
         editor.apply();
     }
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
     public interface ActivityHandler {
         void handleResult(int resultCode, Intent data);
     }