diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 11763e49..144b2e66 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -160,11 +160,11 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 
+        <!-- No screenOrientation="portrait" to fix Oreo crash -->
         <activity
             android:name="net.pokeranalytics.android.ui.activity.ColorPickerActivity"
             android:theme="@style/PokerAnalyticsTheme.AlertDialog"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait" />
+            android:launchMode="singleTop"/>
 
         <meta-data
             android:name="preloaded_fonts"
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/ColorPickerActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/ColorPickerActivity.kt
index ce8faf29..9b420279 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/ColorPickerActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/ColorPickerActivity.kt
@@ -3,6 +3,8 @@ package net.pokeranalytics.android.ui.activity
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ActivityInfo
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
@@ -33,6 +35,11 @@ class ColorPickerActivity : PokerAnalyticsActivity() {
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
+
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { // used to fix Oreo crash
+			requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+		}
+
 		setContentView(R.layout.activity_color_picker)
 
 		initUI()