diff --git a/Python/Product/EnvironmentsList/ToolWindow.xaml b/Python/Product/EnvironmentsList/ToolWindow.xaml
index a39c1fedb2..8714ab2a59 100644
--- a/Python/Product/EnvironmentsList/ToolWindow.xaml
+++ b/Python/Product/EnvironmentsList/ToolWindow.xaml
@@ -12,6 +12,8 @@
              d:DesignHeight="300" d:DesignWidth="800"
              UseLayoutRounding="True"
              SnapsToDevicePixels="True"
+             KeyboardNavigation.TabNavigation="Cycle"
+             KeyboardNavigation.ControlTabNavigation="Cycle"
              Background="{DynamicResource {x:Static wpf:Controls.BackgroundKey}}"
              TextElement.Foreground="{DynamicResource {x:Static wpf:Controls.ForegroundKey}}">
     <UserControl.CommandBindings>