diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp
index d7fb0d767ca..84573b335b6 100644
--- a/src/plugins/fakevim/fakevimactions.cpp
+++ b/src/plugins/fakevim/fakevimactions.cpp
@@ -204,6 +204,11 @@ FakeVimSettings *theFakeVimSettings()
     item->setSettingsKey(group, _("Backspace"));
     instance->insertItem(ConfigBackspace, item, _("backspace"), _("bs"));
 
+    item = new SavedAction(instance);
+    item->setDefaultValue(_("@,48-57,_,192-255"));
+    item->setSettingsKey(group, _("IsKeyword"));
+    instance->insertItem(ConfigIsKeyword, item, _("iskeyword"), _("isk"));
+
     item = new SavedAction(instance);
     item->setText(QCoreApplication::translate("FakeVim::Internal",
         "FakeVim properties..."));
diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h
index abc1ddd6084..a05e129c9be 100644
--- a/src/plugins/fakevim/fakevimactions.h
+++ b/src/plugins/fakevim/fakevimactions.h
@@ -60,6 +60,9 @@ enum FakeVimSettingsCode
     //         stop once at the start of insert.
     ConfigBackspace,
 
+    // @,48-57,_,192-255
+    ConfigIsKeyword,
+
     // other actions
     SettingsDialog,
 };
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp
index 8c7974496dd..e3a04300dde 100644
--- a/src/plugins/fakevim/fakevimhandler.cpp
+++ b/src/plugins/fakevim/fakevimhandler.cpp
@@ -687,11 +687,11 @@ FakeVimHandler::Private::Mappings FakeVimHandler::Private::m_mappings;
 
 FakeVimHandler::Private::Private(FakeVimHandler *parent, QWidget *widget)
 {
-    //static PythonHighlighterRules pythonRules;
+    static PythonHighlighterRules pythonRules;
     q = parent;
     m_textedit = qobject_cast<QTextEdit *>(widget);
     m_plaintextedit = qobject_cast<QPlainTextEdit *>(widget);
-    //new Highlighter(EDITOR(document()), &pythonRules);
+    new Highlighter(EDITOR(document()), &pythonRules);
     init();
 }
 
diff --git a/src/plugins/fakevim/fakevimoptions.ui b/src/plugins/fakevim/fakevimoptions.ui
index d858e1074d1..3b19bc3af24 100644
--- a/src/plugins/fakevim/fakevimoptions.ui
+++ b/src/plugins/fakevim/fakevimoptions.ui
@@ -163,6 +163,16 @@
        <widget class="QLineEdit" name="lineEditBackspace"/>
       </item>
       <item row="9" column="0">
+       <widget class="QLabel" name="labelIsKeyword">
+        <property name="text">
+         <string>Keyword characters:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="9" column="1" colspan="2">
+       <widget class="QLineEdit" name="lineEditIsKeyword"/>
+      </item>
+      <item row="10" column="0">
        <spacer name="verticalSpacer">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
@@ -178,7 +188,7 @@
         </property>
        </spacer>
       </item>
-      <item row="10" column="0" colspan="3">
+      <item row="11" column="0" colspan="3">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QPushButton" name="pushButtonCopyTextEditorSettings">
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index bde8d7e132e..e0d9fc43cbf 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -176,6 +176,8 @@ QWidget *FakeVimOptionPage::createPage(QWidget *parent)
         m_ui.spinBoxTabStop);
     m_group.insert(theFakeVimSetting(ConfigBackspace),
         m_ui.lineEditBackspace);
+    m_group.insert(theFakeVimSetting(ConfigIsKeyword),
+        m_ui.lineEditIsKeyword);
 
     m_group.insert(theFakeVimSetting(ConfigAutoIndent),
         m_ui.checkBoxAutoIndent);