2 files changed, 6 insertions, 8 deletions
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 3a7e6d7e..fcc3799d 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -2224,11 +2224,7 @@ static void UI_LoadHumanItems( void )
 
   if( BG_WeaponIsAllowed( WP_MACHINEGUN ) )
     UI_AddItem( WP_MACHINEGUN );
-
-  if( BG_WeaponIsAllowed( WP_HBUILD2 ) &&
-      BG_FindStagesForWeapon( WP_HBUILD2, UI_GetCurrentHumanStage( ) ) )
-    UI_AddItem( WP_HBUILD2 );
-  else if( BG_WeaponIsAllowed( WP_HBUILD ) )
+  if( BG_WeaponIsAllowed( WP_HBUILD ) )
     UI_AddItem( WP_HBUILD );
 }
 
diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c
index f0dce0bc..2b06329a 100644
--- a/src/ui/ui_shared.c
+++ b/src/ui/ui_shared.c
@@ -1566,7 +1566,12 @@ void Menus_CloseAll( qboolean force )
   }
 
   if( force )
+  {
     openMenuCount = 0;
+    g_editingField = qfalse;
+    g_waitingForKey = qfalse;
+    g_editItem = NULL;
+  }
 }
 
 
@@ -4075,9 +4080,6 @@ void Menu_HandleKey( menuDef_t *menu, int key, qboolean down )
   itemDef_t *item = NULL;
   qboolean inHandler = qfalse;
 
-  if( inHandler )
-    return;
-
   inHandler = qtrue;
 
   if( g_waitingForKey && down )