diff --git a/src/vs/workbench/contrib/terminal/browser/media/GitTabExpansion.psm1 b/src/vs/workbench/contrib/terminal/browser/media/GitTabExpansion.psm1
index 981c671d617..ba3fedbd951 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/GitTabExpansion.psm1
+++ b/src/vs/workbench/contrib/terminal/browser/media/GitTabExpansion.psm1
@@ -38,7 +38,7 @@ function Get-AliasPattern($cmd) {
 }
 
 $Global:GitTabSettings = New-Object PSObject -Property @{
-	AllCommands = $true
+	AllCommands = $false
 	KnownAliases = @{
 		'!f() { exec vsts code pr "$@"; }; f' = 'vsts.pr'
 	}
@@ -602,6 +602,7 @@ function GitTabExpansionInternal($lastBlock, $GitStatus = $null) {
 	}
 }
 
+get-
 function ConvertTo-VscodeCompletion {
 	Param(
 		[Parameter(ValueFromPipeline=$true)]
diff --git a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1 b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
index 4638b507d7f..64accb4b608 100644
--- a/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
+++ b/src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1
@@ -199,9 +199,11 @@ function Set-MappedKeyHandlers {
 
 		Set-PSReadLineKeyHandler -Chord 'F12,g' -ScriptBlock {
 			Import-Module "$PSScriptRoot\GitTabExpansion.psm1"
+			Remove-PSReadLineKeyHandler -Chord 'F12,g'
 		}
 		Set-PSReadLineKeyHandler -Chord 'F12,h' -ScriptBlock {
 			Import-Module "$PSScriptRoot\CodeTabExpansion.psm1"
+			Remove-PSReadLineKeyHandler -Chord 'F12,h'
 		}
 	}
 }