diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp
index 804c8a7dc..cea6e28ac 100755
--- a/xvaga/xvaga.cpp
+++ b/xvaga/xvaga.cpp
@@ -440,6 +440,14 @@ void xvt_app_create(int argc, char **argv, unsigned long flags,
   bool bHasMenu = true, bCanChangeFirm = true;
 
 #ifdef WIN32
+  if (wxTheApp->GetComCtl32Version() >= 600 && ::wxDisplayDepth() >= 32)
+  {
+    wxSystemOptions::SetOption(wxT("msw.display.directdraw"), 1);
+    wxSystemOptions::SetOption(wxT("msw.remap"), 2);
+  }
+  else
+    wxSystemOptions::SetOption(wxT("msw.remap"), 0);
+
   HWND hwndParent = (HWND)OsWin32_FindMenuContainer();
   if (hwndParent != NULL)
   {
@@ -4039,7 +4047,6 @@ void xvt_vobj_destroy(WINDOW win)
   if (w != NULL)
   {
     xvt_win_set_caret_visible(win, FALSE);
-    
     w->Destroy();              // same as delete w
     _nice_windows.Delete(win); // Elimina "di nuovo" dalla lista delle finestre attive
   }