diff --git a/ChangeLog b/ChangeLog
index 67716295d..fa347be9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 2013-02-07 Mike Blumenkrantz
 
+        * keyboard mapping change now also disables for window class "vmware"
         * added option for remembering filemanager windows globally
         * added edit functionality to window remembers dialog
 
diff --git a/NEWS b/NEWS
index c4c07b744..544bf395f 100644
--- a/NEWS
+++ b/NEWS
@@ -162,3 +162,4 @@ Fixes:
     * moved "allow windows above fullscreen windows" option to geometry settings dialog
     * fix filemanager efreet cache listeners and updates
     * fix clock timerfd usage to actually detect date changes
+    * keyboard mapping change now also disables for window class "vmware"
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index d4c3589bd..fdb6871cd 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -5037,7 +5037,7 @@ _e_border_free(E_Border *bd)
      eina_stringshare_del(bd->client.icccm.name);
    if (bd->client.icccm.class)
      {
-        if (!strcmp(bd->client.icccm.class, "Vmplayer"))
+        if ((!strcasecmp(bd->client.icccm.class, "vmplayer")) || (!strcasecmp(bd->client.icccm.class, "vmware")))
           e_bindings_mapping_change_enable(EINA_TRUE);
         eina_stringshare_del(bd->client.icccm.class);
      }