diff --git a/lib/components/ModeSelect.js b/lib/components/ModeSelect.js
index 28404d20..09dae7e6 100644
--- a/lib/components/ModeSelect.js
+++ b/lib/components/ModeSelect.js
@@ -161,8 +161,8 @@ export default class ModeSelect extends React.Component {
     let filteredOptions = modes
       .filter(mode => {
         let search = this.state.search
-        let nameMatched = mode.name.match(search)
-        let aliasMatched = _.some(mode.alias, alias => alias.match(search))
+        let nameMatched = mode.name.match(_.escapeRegExp(search))
+        let aliasMatched = _.some(mode.alias, alias => alias.match(_.escapeRegExp(search)))
         return nameMatched || aliasMatched
       })
       .map((mode, index) => {
diff --git a/lib/vars/modes.js b/lib/vars/modes.js
index fe53c756..256769cf 100644
--- a/lib/vars/modes.js
+++ b/lib/vars/modes.js
@@ -68,7 +68,7 @@ const modes = [
   {
     name: 'csharp',
     label: 'C#',
-    alias: ['cs'],
+    alias: ['cs', 'c#'],
     mode: 'csharp'
   },
   {