diff --git a/widget/src/os2/nsLookAndFeel.cpp b/widget/src/os2/nsLookAndFeel.cpp
index f00a4cd4160..ebf63105815 100644
--- a/widget/src/os2/nsLookAndFeel.cpp
+++ b/widget/src/os2/nsLookAndFeel.cpp
@@ -149,11 +149,9 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
       idx = SYSCLR_MENUDISABLEDTEXT;
       break;
     case eColor_highlight:
-    case eColor__moz_menuhover:
       idx = SYSCLR_HILITEBACKGROUND;
       break;
     case eColor_highlighttext:
-    case eColor__moz_menuhovertext:
       idx = SYSCLR_HILITEFOREGROUND;
       break;
     case eColor_inactiveborder:
@@ -221,13 +219,17 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
     case eColor__moz_buttondefault:
       idx = SYSCLR_BUTTONDEFAULT;
       break;
+    case eColor__moz_menuhover:
+      idx = SYSCLR_MENUHILITEBGND;
+      break;
+    case eColor__moz_menuhovertext:
     case eColor__moz_menubarhovertext:
-      idx = SYSCLR_MENUTEXT;
+      idx = SYSCLR_MENUHILITE;
       break;
     default:
       idx = SYSCLR_WINDOW;
       break;
-    }
+  }
 
   long lColor = WinQuerySysColor( HWND_DESKTOP, idx, 0);
 
@@ -348,7 +350,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
     default:
         aMetric = 0;
         res = NS_ERROR_FAILURE;
-    }
+  }
   return res;
 }
 
@@ -390,7 +392,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricFloatID aID, float & aMetri
     default:
         aMetric = -1.0;
         res = NS_ERROR_FAILURE;
-    }
+  }
   return res;
 }