diff --git a/scripts/Install-VSCode.ps1 b/scripts/Install-VSCode.ps1
index 773e4deb98..a61efcacc5 100644
--- a/scripts/Install-VSCode.ps1
+++ b/scripts/Install-VSCode.ps1
@@ -25,6 +25,8 @@
 .EXTERNALSCRIPTDEPENDENCIES
 
 .RELEASENOTES
+    21/03/2018 - added functionality to install the VSCode context menus. Also, VSCode is now always added to the search path
+    --
     20/03/2018 - fix OS detection to prevent error
     --
     28/12/2017 - added functionality to support 64-bit versions of VSCode
@@ -69,6 +71,9 @@
     When present, causes Visual Studio Code to be launched as soon as installation
     has finished.
 
+.PARAMETER EnableContextMenus
+    When present, causes the installer to configure the Explorer context menus
+
 .EXAMPLE
     Install-VSCode.ps1 -Architecture 32-bit
 
@@ -128,7 +133,9 @@ param(
     [ValidateNotNull()]
     [string[]]$AdditionalExtensions = @(),
 
-    [switch]$LaunchWhenDone
+    [switch]$LaunchWhenDone,
+
+    [switch]$EnableContextMenus
 )
 
 if (($PSVersionTable.PSVersion.Major -le 5) -or $IsWindows) {
@@ -178,7 +185,12 @@ if (($PSVersionTable.PSVersion.Major -le 5) -or $IsWindows) {
             Invoke-WebRequest -Uri "https://vscode-update.azurewebsites.net/latest/$($bitVersion)/$($BuildEdition)" -OutFile "$env:TEMP\vscode-$($BuildEdition).exe"
 
             Write-Host "`nInstalling $appName..." -ForegroundColor Yellow
-            Start-Process -Wait "$env:TEMP\vscode-$($BuildEdition).exe" -ArgumentList /silent, /mergetasks=!runcode
+            if ($EnableContextMenus) {
+                Start-Process -Wait "$env:TEMP\vscode-$($BuildEdition).exe" -ArgumentList "/verysilent /tasks=addcontextmenufiles,addcontextmenufolders,addtopath"
+            }
+            else {
+                Start-Process -Wait "$env:TEMP\vscode-$($BuildEdition).exe" -ArgumentList "/verysilent /tasks=addtopath"
+            }
         }
         else {
             Write-Host "`n$appName is already installed." -ForegroundColor Yellow