--- a/notepad/notepad1/LibSrc/NpdPopupList.cpp	Fri Mar 12 15:42:35 2010 +0200
+++ b/notepad/notepad1/LibSrc/NpdPopupList.cpp	Mon Mar 15 12:40:18 2010 +0200
@@ -116,6 +116,11 @@
     if ( !iFinished || *iFinished ) // really finished
         {
         CAknPopupList::AttemptExitL(aAccept);
+        if ( iFlags & ENotepadIsViewDeactivated )
+        	{
+            iEikonEnv->RemoveFromStack(this);
+            CAknEnv::StopSchedulerWaitWithBusyMessage(iWait);	
+        	}        
         }
     else // empty -> non-empty
         {