diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 06da278b1b..cb64c7aaf6 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -145,6 +145,10 @@ protected:
     virtual GtkEntry *GetEntry() const wxOVERRIDE
         { return m_entry; }
 
+    virtual int GTKIMFilterKeypress(GdkEventKey* event) const wxOVERRIDE
+        { return GTKEntryIMFilterKeypress(event); }
+
+
     GtkEntry*   m_entry;
 
 private:
diff --git a/include/wx/gtk/textentry.h b/include/wx/gtk/textentry.h
index aad2982d80..a4f92fc7b7 100644
--- a/include/wx/gtk/textentry.h
+++ b/include/wx/gtk/textentry.h
@@ -91,8 +91,9 @@ protected:
     virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE;
     virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE;
 
-    // Override the base class method to use GtkEntry IM context.
-    virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
+    // Call this from the overridden wxWindow::GTKIMFilterKeypress() to use
+    // GtkEntry IM context.
+    int GTKEntryIMFilterKeypress(GdkEventKey* event) const;
 
     static int GTKGetEntryTextLength(GtkEntry* entry);
 
diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 850082ec41..6d5d04edbe 100644
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -862,7 +862,7 @@ void wxTextEntry::ForceUpper()
 // IM handling
 // ----------------------------------------------------------------------------
 
-int wxTextEntry::GTKIMFilterKeypress(GdkEventKey* event) const
+int wxTextEntry::GTKEntryIMFilterKeypress(GdkEventKey* event) const
 {
     int result = false;
 #if GTK_CHECK_VERSION(2, 22, 0)