diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index 73a311bf8b..b5d7218135 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -197,6 +197,10 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
 
     // Reduces flicker on GTK+/X11
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+
+    // Make sure it can take the focus
+    SetCanFocus(true);
+
     return true;
 }
 
diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index ecace6cb06..0751300339 100644
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -39,12 +39,6 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 #endif
 #endif
 
-//----------------------------------------------------------------------
-
-// Should a wxPopupWindow be used for the call tips and autocomplete windows?
-#ifndef wxSTC_USE_POPUP
-#define wxSTC_USE_POPUP 1
-#endif
 
 //----------------------------------------------------------------------
 // BEGIN generated section.  The following code is automatically generated