--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlerback.cpp	Thu Jan 07 12:46:23 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlerback.cpp	Mon Jan 18 20:19:20 2010 +0200
@@ -175,7 +175,9 @@
                 CleanupStack::PushL(navigationalState);
 
                 // let Back Stepping Service handle the event
-                if(2 == navigationalState->Levels()&&  iNavigationalState->BackExitStatus())
+                if((2 == navigationalState->Levels()||
+                		iNavigationalState->StartingLevel() == navigationalState->Levels()-1)
+                		&&  iNavigationalState->BackExitStatus())
                     {
                     iBSWrapper->HandleBackCommandL( KPhotosSuiteNavigation );
                     if(iAppUi)
@@ -183,13 +185,6 @@
                         iAppUi->ProcessCommandL(EAknSoftkeyExit);    
                         }
                     }
-                else if (!(iNavigationalState->BackExitStatus()))
-                    {
-                    if(iAppUi)
-                        {
-                        iAppUi->ProcessCommandL(EAknSoftkeyExit);    
-                        }
-                    }
                 else if( iIsViewActivated )
                     {
                     iIsViewActivated = EFalse;
@@ -213,13 +208,6 @@
     		        }
     		    else
     		        {
-    		        if (!(iNavigationalState->BackExitStatus()))
-    		            {
-    		            if(iAppUi)
-    		                {
-    		                iAppUi->ProcessCommandL(EAknSoftkeyExit);    
-    		                }
-    		            }
     		        if( iIsViewActivated )
     		            {
     		            iIsViewActivated = EFalse;