diff --git a/src/org/mythtv/client/ui/HomeActivity.java b/src/org/mythtv/client/ui/HomeActivity.java
index 61581c62..833387c4 100644
--- a/src/org/mythtv/client/ui/HomeActivity.java
+++ b/src/org/mythtv/client/ui/HomeActivity.java
@@ -83,6 +83,7 @@ public boolean onCreateOptionsMenu( Menu menu ) {
 		if( isMasterBackendConnected() ) {
 			MenuInflater inflater = getMenuInflater();
 			inflater.inflate( R.menu.home_main_menu, menu );
+			Log.d( TAG, "onCreateOptionsMenu : menu inflated" );
 		}
 		
 		Log.d( TAG, "onCreateOptionsMenu : exit" );
@@ -102,7 +103,7 @@ public boolean onOptionsItemSelected( MenuItem item ) {
 
 		switch( item.getItemId() ) {
 		case R.id.menu_frontends:
-			Log.d( TAG, "onOptionsItemSelected : setup selected" );
+			Log.d( TAG, "onOptionsItemSelected : Mythmote selected" );
 
 			if( isMasterBackendConnected() ) {
 				startActivity( new Intent( this, MythmoteActivity.class ) );
diff --git a/src/org/mythtv/client/ui/frontends/AbstractFrontendsActivity.java b/src/org/mythtv/client/ui/frontends/AbstractFrontendsActivity.java
index f49c8aaa..5ddc4e6d 100644
--- a/src/org/mythtv/client/ui/frontends/AbstractFrontendsActivity.java
+++ b/src/org/mythtv/client/ui/frontends/AbstractFrontendsActivity.java
@@ -56,17 +56,7 @@ public boolean onOptionsItemSelected( MenuItem item ) {
 
 		switch( item.getItemId() ) {
 			case android.R.id.home:
-				// app icon in action bar clicked; go home
-				if( getMainApplication().getConnectedLocationProfile().equals( "HOME" ) ) {
-					Intent intent = new Intent( this, HomeActivity.class );
-					intent.addFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP );
-					startActivity( intent );
-				} else {
-					Intent intent = new Intent( this, AwayActivity.class );
-					intent.addFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP );
-					startActivity( intent );
-				}
-
+				this.finish();
 				return true;
 		}