--- a/application/src/PodcastFeedView.cpp	Sun Feb 28 19:35:33 2010 +0000
+++ b/application/src/PodcastFeedView.cpp	Sun Feb 28 20:09:49 2010 +0000
@@ -174,13 +174,27 @@
 	                                  TUid aCustomMessageId,
 	                                  const TDesC8& aCustomMessage)
 	{
-	UpdateToolbar();
-	
 	CPodcastListView::DoActivateL(aPrevViewId, aCustomMessageId, aCustomMessage);
 
-	if (iFirstActivateAfterLaunch)
+	if (aPrevViewId.iViewUid == KUidPodcastShowsViewID)
+		{
+		// back key from shows view
+		iViewingShows = EFalse;
+		}
+	
+	if (iViewingShows)
 		{
-		iFirstActivateAfterLaunch = EFalse;
+		// go to shows view
+		AppUi()->ActivateLocalViewL(KUidPodcastShowsViewID,  TUid::Uid(0), KNullDesC8());
+		} 
+	else 
+		{
+		UpdateToolbar();
+
+		if (iFirstActivateAfterLaunch)
+			{
+			iFirstActivateAfterLaunch = EFalse;
+			}
 		}
 	}
 
@@ -212,7 +226,7 @@
 				{
 				iPodcastModel.ActiveShowList().Reset();
 				iPodcastModel.SetActiveFeedInfo((*sortedItems)[index]);			
-
+				iViewingShows = ETrue;
 				AppUi()->ActivateLocalViewL(KUidPodcastShowsViewID,  TUid::Uid(0), KNullDesC8());
 				}
 			}