diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp
index c0ded589c..4281feb9e 100644
--- a/Strategic/Map Screen Interface Map.cpp	
+++ b/Strategic/Map Screen Interface Map.cpp	
@@ -5734,42 +5734,20 @@ void RenderIconsPerSectorForSelectedTown( void )
 		// now display
 		for( iCurrentTroopIcon = 0; iCurrentTroopIcon < iTotalNumberOfTroops; iCurrentTroopIcon++ )
 		{
-			// get screen x and y coords
-			if( sSectorMilitiaMapSector == iCounter )
-			{
-				sX =  ( iCurrentTroopIcon % POPUP_MILITIA_ICONS_PER_ROW ) * MEDIUM_MILITIA_ICON_SPACING + MAP_MILITIA_BOX_POS_X + MAP_MILITIA_MAP_X + ( ( iCounter % MILITIA_BOX_ROWS ) * MILITIA_BOX_BOX_WIDTH ) + 2;
-				sY =  ( iCurrentTroopIcon / POPUP_MILITIA_ICONS_PER_ROW ) * ( MEDIUM_MILITIA_ICON_SPACING - 1 ) + MAP_MILITIA_BOX_POS_Y + MAP_MILITIA_MAP_Y + ( ( iCounter / MILITIA_BOX_ROWS ) * MILITIA_BOX_BOX_HEIGHT ) + 3;
+			sX =  ( iCurrentTroopIcon % POPUP_MILITIA_ICONS_PER_ROW ) * MEDIUM_MILITIA_ICON_SPACING + MAP_MILITIA_BOX_POS_X + MAP_MILITIA_MAP_X + ( ( iCounter % MILITIA_BOX_ROWS ) * MILITIA_BOX_BOX_WIDTH ) + 3;
+			sY =  ( iCurrentTroopIcon / POPUP_MILITIA_ICONS_PER_ROW ) * ( MEDIUM_MILITIA_ICON_SPACING ) + MAP_MILITIA_BOX_POS_Y + MAP_MILITIA_MAP_Y + ( ( iCounter / MILITIA_BOX_ROWS ) * MILITIA_BOX_BOX_HEIGHT ) + 3;
 
-				if( iCurrentTroopIcon < iNumberOfGreens )
-				{
-					iCurrentIcon = 5;
-				}
-				else if( iCurrentTroopIcon < iNumberOfGreens + iNumberOfRegulars )
-				{
-					iCurrentIcon = 6;
-				}
-				else
-				{
-					iCurrentIcon = 7;
-				}
+			if( iCurrentTroopIcon < iNumberOfGreens )
+			{
+				iCurrentIcon = 8;
+			}
+			else if( iCurrentTroopIcon < iNumberOfGreens + iNumberOfRegulars )
+			{
+				iCurrentIcon = 9;
 			}
 			else
 			{
-				sX =  ( iCurrentTroopIcon % POPUP_MILITIA_ICONS_PER_ROW ) * MEDIUM_MILITIA_ICON_SPACING + MAP_MILITIA_BOX_POS_X + MAP_MILITIA_MAP_X + ( ( iCounter % MILITIA_BOX_ROWS ) * MILITIA_BOX_BOX_WIDTH ) + 3;
-				sY =  ( iCurrentTroopIcon / POPUP_MILITIA_ICONS_PER_ROW ) * ( MEDIUM_MILITIA_ICON_SPACING ) + MAP_MILITIA_BOX_POS_Y + MAP_MILITIA_MAP_Y + ( ( iCounter / MILITIA_BOX_ROWS ) * MILITIA_BOX_BOX_HEIGHT ) + 3;
-
-				if( iCurrentTroopIcon < iNumberOfGreens )
-				{
-					iCurrentIcon = 8;
-				}
-				else if( iCurrentTroopIcon < iNumberOfGreens + iNumberOfRegulars )
-				{
-					iCurrentIcon = 9;
-				}
-				else
-				{
-					iCurrentIcon = 10;
-				}
+				iCurrentIcon = 10;
 			}
 
 			BltVideoObject( FRAME_BUFFER, hVObject, ( UINT16 )( iCurrentIcon ), sX, sY, VO_BLT_SRCTRANSPARENCY, NULL );
diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index 561f60af2..c16fbf75e 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -7092,17 +7092,20 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
 
 				case TAB:
 					// go to next tab in enhanced description box
-					if( InItemDescriptionBox( ) && gGameSettings.fOptions[ TOPTION_ENHANCED_DESC_BOX ] == TRUE )
-					{			
-						if ( gubDescBoxPage < 2 )
-						{
-							gubDescBoxPage++;
+					if( fCtrl )
+					{
+						if( InItemDescriptionBox( ) && gGameSettings.fOptions[ TOPTION_ENHANCED_DESC_BOX ] == TRUE )
+						{			
+							if ( gubDescBoxPage < 2 )
+							{
+								gubDescBoxPage++;
+							}
+							else
+							{					
+								gubDescBoxPage = 0;
+							}
+							HandleItemDescTabButton( );
 						}
-						else
-						{					
-							gubDescBoxPage = 0;
-						}
-						HandleItemDescTabButton( );
 					}
 					break;