diff --git a/src/main/java/com/af/synapse/MainActivity.java b/src/main/java/com/af/synapse/MainActivity.java
index 620b19b..db6a45d 100644
--- a/src/main/java/com/af/synapse/MainActivity.java
+++ b/src/main/java/com/af/synapse/MainActivity.java
@@ -14,6 +14,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
@@ -117,6 +118,9 @@ protected void onCreate(Bundle savedInstanceState) {
         setPaddingDimensions();
         setContentView(R.layout.activity_loading);
 
+        if (!Utils.appStarted)
+            this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+
         super.onCreate(fragments == null ? null : savedInstanceState);
 
         if (fragments == null) {
@@ -189,6 +193,9 @@ private void continueCreate() {
         setPaddingDimensions();
         L.i("Interface creation finished in " + (System.nanoTime() - startTime) + "ns");
 
+        if (Utils.appStarted)
+            this.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+
         if (!BootService.getBootFlag() && !BootService.getBootFlagPending()) {
             new AlertDialog.Builder(this)
                 .setTitle(R.string.popup_failed_boot_title)
diff --git a/src/main/java/com/af/synapse/MyPreferenceFragment.java b/src/main/java/com/af/synapse/MyPreferenceFragment.java
new file mode 100644
index 0000000..0177d1c
--- /dev/null
+++ b/src/main/java/com/af/synapse/MyPreferenceFragment.java
@@ -0,0 +1,34 @@
+package com.af.synapse;
+
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.af.synapse.utils.Utils;
+
+
+public class MyPreferenceFragment extends PreferenceFragment {
+
+    public MyPreferenceFragment() {
+        super();
+    }
+
+    @Override
+    public void onCreate(final Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        PreferenceManager.setDefaultValues(Utils.settingsActivity, R.xml.preference_main, true);
+        addPreferencesFromResource(R.xml.preference_main);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup root, Bundle savedInstanceState){
+        View v = super.onCreateView(inflater, root, savedInstanceState);
+        if (v != null)
+            v.setPadding(0, MainActivity.topPadding, 0, 0);
+        return v;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/af/synapse/Settings.java b/src/main/java/com/af/synapse/Settings.java
index 7938e84..383a337 100644
--- a/src/main/java/com/af/synapse/Settings.java
+++ b/src/main/java/com/af/synapse/Settings.java
@@ -7,13 +7,9 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
 
 import com.af.synapse.utils.Utils;
@@ -129,22 +125,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         return super.onOptionsItemSelected(item);
     }
-
-    public class MyPreferenceFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(final Bundle savedInstanceState)
-        {
-            super.onCreate(savedInstanceState);
-            PreferenceManager.setDefaultValues(Settings.this, R.xml.preference_main, true);
-            addPreferencesFromResource(R.xml.preference_main);
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup root, Bundle savedInstanceState){
-            View v = super.onCreateView(inflater, root, savedInstanceState);
-            if (v != null)
-                v.setPadding(0, MainActivity.topPadding, 0, 0);
-            return v;
-        }
-    }
 }