diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index f548be6ac3..b0633936f3 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -1822,6 +1822,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                     // where did the click occur?
                     POINT ptClick;
+#ifdef __WXWINCE__
+                  if(nmhdr->code == GN_CONTEXTMENU) {
+                      ptClick = ((NMRGINFO*)nmhdr)->ptAction;
+                  } else 
+#endif __WXWINCE__
                     if ( !::GetCursorPos(&ptClick) )
                     {
                         wxLogLastError(_T("GetCursorPos"));
@@ -2152,6 +2157,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 LV_HITTESTINFO lvhti;
                 wxZeroMemory(lvhti);
 
+#ifdef __WXWINCE__
+              if(nmhdr->code == GN_CONTEXTMENU) {
+                  lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction;
+              } else 
+#endif __WXWINCE__
                 ::GetCursorPos(&(lvhti.pt));
                 ::ScreenToClient(GetHwnd(),&(lvhti.pt));
                 if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp
index d281fe97b6..f11e04cb19 100644
--- a/src/msw/stattext.cpp
+++ b/src/msw/stattext.cpp
@@ -192,7 +192,9 @@ wxSize wxStaticText::DoGetBestSize() const
             curLine += *pc;
         }
     }
-
+#ifdef __WXWINCE__
+    if(widthTextMax) widthTextMax += 2;
+#endif
     return wxSize(widthTextMax, heightTextTotal);
 }