diff --git a/vlc-android/src/org/videolan/vlc/android/MainActivity.java b/vlc-android/src/org/videolan/vlc/android/MainActivity.java
index 0397b22be26c8a0d93466f0d6dc45db5ccb2ba01..2b92beb078a8e0b4a8bc94930434e97724314fba 100644
--- a/vlc-android/src/org/videolan/vlc/android/MainActivity.java
+++ b/vlc-android/src/org/videolan/vlc/android/MainActivity.java
@@ -91,8 +91,12 @@ public class MainActivity extends TabActivity {
             Log.d(TAG, "Started from notification.");
             showAudioTab();
         } else {
-            // TODO: load the last tab-state
-            showVideoTab();
+            // load the last tab-state
+            int state = savedInstanceState == null ? VIDEO_TAB : savedInstanceState.getInt("mCurrentState");
+            if(state == VIDEO_TAB)
+                showVideoTab();
+            else
+                showAudioTab();
         }
 
         /* Show info/alpha/beta Warning */
@@ -129,6 +133,15 @@ public class MainActivity extends TabActivity {
         return false;
     }
 
+    /**
+     * Save currently opened tab (video/audio) for above
+     */
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        savedInstanceState.putInt("mCurrentState", mCurrentState);
+        super.onSaveInstanceState(savedInstanceState);
+    }
+
     /**
      * Handle onClick form menu buttons
      */