diff --git a/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java b/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java
index 52f6db7da8..f727c8881f 100644
--- a/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java
@@ -179,11 +179,20 @@ public class DirectoryActivity extends Activity implements AdapterView.OnItemCli
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event)
     {
-        if(keyCode == KeyEvent.KEYCODE_BACK && backStack.size() > 1)
+        if(keyCode == KeyEvent.KEYCODE_BACK)
         {
-            backStack.remove(backStack.size() - 1);
-            wrapFiles();
-            return true;
+        	if(backStack.size() > 1)
+        	{
+        		backStack.remove(backStack.size() - 1);
+        		wrapFiles();
+        	}
+        	else
+        	{
+        		Intent intent=new Intent();
+                setResult(RESULT_CANCELED, intent);
+        		finish();
+        	}
+    		return true;
         }
 
         return super.onKeyDown(keyCode, event);