diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 0d396f3d56..29296978d9 100644
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -24,6 +24,8 @@
     #include "wx/wx.h"
 #endif
 
+#include "wx/sysopt.h"
+
 //-----------------------------------------------------------------------------
 // Header of this .cpp file
 //-----------------------------------------------------------------------------
@@ -115,6 +117,7 @@ MyFrame::MyFrame(wxWindow* parent)
     // NOTE: For toolbars you currently should do it exactly like this.
     // With toolbars, you currently can't create one, and set it later. It
     // needs to be all in one step.
+    wxSystemOptions::SetOption ( wxT("msw.remap"), 0 );
     SetToolBar(wxXmlResource::Get()->LoadToolBar(this, wxT("main_toolbar")));
 
 #if wxUSE_STATUSBAR
diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index ed706c7857..f834b6a1a1 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -5,6 +5,7 @@
 <object class="wxDialog" name="controls_dialog">
     <title>Controls Example</title>
     <style>wxCAPTION|wxSYSTEM_MENU|wxRESIZE_BORDER</style>
+    <exstyle>wxDIALOG_EX_CONTEXTHELP</exstyle>
     <centered>1</centered>
     <object class="wxFlexGridSizer">
         <cols>1</cols>
@@ -633,10 +634,10 @@
                                     <dimension>1</dimension>
                                     <selection>0</selection>
                                     <content>
-                                        <item tooltip="Powerful radio station">Power 108</item>
+                                        <item tooltip="Powerful radio station" helptext="This station is for amateurs of hard rock and heavy metal">Power 108</item>
                                         <item tooltip="">WMMS 100.7</item>
                                         <item tooltip="E=mc^2">Energy 98.3</item>
-                                        <item>CHUM FM</item>
+                                        <item helptext="Favourite chukcha's radio">CHUM FM</item>
                                         <item>92FM</item>
                                     </content>
                                 </object>