diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b28c03df..9d881aa0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -11,7 +11,7 @@
                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
         <activity android:name="GameActivity"
                   android:label="Löve for Android"
-                  android:screenOrientation="landscape">
+                  android:screenOrientation="unspecified">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/src/org/libsdl/app/SDLActivity.java b/src/org/libsdl/app/SDLActivity.java
index e51c688d..aa84a3a5 100644
--- a/src/org/libsdl/app/SDLActivity.java
+++ b/src/org/libsdl/app/SDLActivity.java
@@ -109,6 +109,12 @@ public class SDLActivity extends Activity {
     protected void onDestroy() {
         super.onDestroy();
         Log.v("SDL", "onDestroy()");
+        
+        if (!isFinishing()) {
+            Log.v("SDL", "Not quitting native app as isFinishing() is false");
+        	return;
+        }
+        
         // Send a quit message to the application
         SDLActivity.nativeQuit();