diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 0c8d4c2e63..f2fe70f69e 100644
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -622,13 +622,19 @@ PyObject* wxPyClassExists(const wxString& className) {
     if (!className)
         return NULL;
 
-    if ((item = PyDict_GetItemString(wxPyPtrTypeMap, (char*)(const char*)name.mbc_str())) != NULL) {
-        name = wxString(PyString_AsString(item), *wxConvCurrent);
-    }
-
+    // Try the name as-is first
     sprintf(buff, "%sPtr", (const char*)name.mbc_str());
     PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
 
+    // if not found see if there is a mapped name for it
+    if ( ! classobj) {
+        if ((item = PyDict_GetItemString(wxPyPtrTypeMap, (char*)(const char*)name.mbc_str())) != NULL) {
+            name = wxString(PyString_AsString(item), *wxConvCurrent);
+            sprintf(buff, "%sPtr", (const char*)name.mbc_str());
+            classobj = PyDict_GetItemString(wxPython_dict, buff);
+        }
+    }
+
     return classobj;  // returns NULL if not found
 }