diff --git a/vscode/keybindings.json b/vscode/keybindings.json
index 41086a3..686ae7c 100644
--- a/vscode/keybindings.json
+++ b/vscode/keybindings.json
@@ -62,5 +62,19 @@
         "key": "shift+delete",
         "command": "editor.action.deleteLines",
         "when": "textInputFocus && !editorReadonly"
+    },
+    {
+        "key": "cmd+e",
+        "command": "-actions.findWithSelection"
+    },
+    {
+        "key": "cmd+e",
+        "command": "editor.emmet.action.expandAbbreviation",
+        "when": "config.emmet.triggerExpansionOnTab && editorTextFocus && !editorReadonly && !editorTabMovesFocus"
+    },
+    {
+        "key": "tab",
+        "command": "-editor.emmet.action.expandAbbreviation",
+        "when": "config.emmet.triggerExpansionOnTab && editorTextFocus && !editorReadonly && !editorTabMovesFocus"
     }
 ]
diff --git a/vscode/settings.json b/vscode/settings.json
index abcc2b8..ceff6a1 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -15,6 +15,10 @@
     "editor.scrollBeyondLastLine": true,
     "editor.snippetSuggestions": "top",
     "editor.wordSeparators": "./\\()\"'-:,.;<>~!#%^&*|+=[]{}`~?",
+    "emmet.includeLanguages": {
+        "flow": "javascriptreact",
+        "javascript": "javascriptreact"
+    },
     "explorer.confirmDragAndDrop": false,
     "files.insertFinalNewline": true,
     "files.saveConflictResolution": "overwriteFileOnDisk",