diff -uNr DEV300_m20_original_code/sc/source/ui/inc/navipi.hxx DEV300_m20/sc/source/ui/inc/navipi.hxx
--- DEV300_m20_original_code/sc/source/ui/inc/navipi.hxx	2008-07-01 16:05:52.000000000 +0800
+++ DEV300_m20/sc/source/ui/inc/navipi.hxx	2008-07-01 15:42:46.000000000 +0800
@@ -245,9 +245,9 @@
 	RowEdit				aEdRow;
 	CommandToolBox		aTbxCmd;
 	ScContentTree		aLbEntries;
+	ScScenarioWindow	aWndScenarios;
 	ScDocListBox		aLbDocuments;
-	ScScenarioWindow	aWndScenarios;
-	
+
 	Timer			aContentTimer;
 
 	String			aTitleBase;
diff -uNr DEV300_m20_original_code/sc/source/ui/navipi/navipi.cxx DEV300_m20/sc/source/ui/navipi/navipi.cxx
--- DEV300_m20_original_code/sc/source/ui/navipi/navipi.cxx	2008-07-02 16:36:14.000000000 +0800
+++ DEV300_m20/sc/source/ui/navipi/navipi.cxx	2008-07-02 16:24:28.000000000 +0800
@@ -673,8 +673,10 @@
 		aEdRow		( this, ScResId( ED_ROW ) ),
 		aTbxCmd		( this, ScResId( TBX_CMD ) ),
 		aLbEntries	( this, ScResId( LB_ENTRIES ) ),
-		aLbDocuments( this, ScResId( LB_DOCUMENTS ) ),
+		/*aLbDocuments( this, ScResId( LB_DOCUMENTS ) ),
+		aWndScenarios( this,ScResId( STR_QHLP_SCEN_LISTBOX), ScResId(STR_QHLP_SCEN_COMMENT)),*/
 		aWndScenarios( this,ScResId( STR_QHLP_SCEN_LISTBOX), ScResId(STR_QHLP_SCEN_COMMENT)),
+		aLbDocuments( this, ScResId( LB_DOCUMENTS ) ),	
 		aStrDragMode ( ScResId( STR_DRAGMODE ) ),
 		aStrDisplay  ( ScResId( STR_DISPLAY ) ),
 		aStrActiveWin( ScResId( STR_ACTIVEWIN ) ),
diff -uNr DEV300_m20_original_code/sc/source/ui/navipi/scenwnd.cxx DEV300_m20/sc/source/ui/navipi/scenwnd.cxx
--- DEV300_m20_original_code/sc/source/ui/navipi/scenwnd.cxx	2008-07-01 15:59:56.000000000 +0800
+++ DEV300_m20/sc/source/ui/navipi/scenwnd.cxx	2008-07-02 10:02:38.000000000 +0800
@@ -58,7 +58,7 @@
 // -----------------------------------------------------------------------
 
 ScScenarioListBox::ScScenarioListBox( Window* pParent )
-	:	ListBox	( pParent, WB_BORDER ),
+	:	ListBox	( pParent, WB_BORDER | WB_TABSTOP ), 
 		rParent ( (ScScenarioWindow&)*pParent ),
 		pAccel	( NULL )
 {
@@ -177,6 +177,7 @@
 
 	Application::InsertAccel( pAccel );
 	aCurText = GetText();
+	ListBox::GetFocus();
 }
 
 // -----------------------------------------------------------------------
@@ -186,6 +187,7 @@
 	Application::RemoveAccel( pAccel );
 	delete pAccel;
 	pAccel = NULL;
+	ListBox::LoseFocus();
 }
 
 // -----------------------------------------------------------------------
@@ -225,6 +227,16 @@
             DoubleClick();
             bHandled = true;
         }
+		else if( KEY_DELETE == aCode.GetCode() )
+		{
+			SfxStringItem aStringItem( SID_DELETE_SCENARIO, GetSelectEntry() );
+				SfxViewFrame* pViewFrm = SfxViewFrame::Current();
+				if (pViewFrm)
+					pViewFrm->GetDispatcher()->Execute( SID_DELETE_SCENARIO,
+					SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD,
+					&aStringItem, 0L, 0L );	
+			bHandled = true;
+		}
     }
     else if ( rNEvt.GetType() == EVENT_COMMAND && GetSelectEntryCount() )
 	{
@@ -279,10 +291,10 @@
 
 ScScenarioWindow::ScScenarioWindow( Window* pParent,const String& aQH_List,
 									const String& aQH_Comment)
-	:	Window		( pParent ), 
+	:	Window		( pParent , WB_DIALOGCONTROL | WB_TABSTOP ),
 		aLbScenario	( this ),
 		aEdComment	( this,  WB_BORDER | WB_LEFT
-						   | WB_READONLY | WB_VSCROLL )
+						   | WB_READONLY | WB_VSCROLL | WB_TABSTOP )
 {
 	Font aFont( GetFont() );
 	aFont.SetTransparent( TRUE );