diff --git a/Ryujinx/Config.cs b/Ryujinx/Config.cs
index 2c02c50f19..71dbbfcbff 100644
--- a/Ryujinx/Config.cs
+++ b/Ryujinx/Config.cs
@@ -31,7 +31,9 @@ namespace Ryujinx
             Device.Log.SetEnable(LogLevel.Warning, Convert.ToBoolean(Parser.Value("Logging_Enable_Warn")));
             Device.Log.SetEnable(LogLevel.Error,   Convert.ToBoolean(Parser.Value("Logging_Enable_Error")));
 
-            Device.System.State.DockedMode = Convert.ToBoolean(Parser.Value("Docked_Mode"));
+            Device.System.State.DockedMode   = Convert.ToBoolean(Parser.Value("Docked_Mode"));
+
+            Device.EnableDeviceVsync = Convert.ToBoolean(Parser.Value("Enable_Vsync"));
 
             string[] FilteredLogClasses = Parser.Value("Logging_Filtered_Classes").Split(',', StringSplitOptions.RemoveEmptyEntries);
 
diff --git a/Ryujinx/Ryujinx.conf b/Ryujinx/Ryujinx.conf
index 6e15a6ac29..c497c08112 100644
--- a/Ryujinx/Ryujinx.conf
+++ b/Ryujinx/Ryujinx.conf
@@ -25,6 +25,9 @@ Logging_Filtered_Classes =
 #Enable or Disable Docked Mode
 Docked_Mode = false
 
+#Enable Game Vsync
+Enable_Vsync = true
+
 #Controller Device Index
 GamePad_Index = 0
 
diff --git a/Ryujinx/Ui/GLScreen.cs b/Ryujinx/Ui/GLScreen.cs
index 4b0c8e8ac5..8adff9c00d 100644
--- a/Ryujinx/Ui/GLScreen.cs
+++ b/Ryujinx/Ui/GLScreen.cs
@@ -313,9 +313,6 @@ namespace Ryujinx
         protected override void OnKeyUp(KeyboardKeyEventArgs e)
         {
             Keyboard = e.Keyboard;
-
-            if (e.Key == Key.Tab)
-                Device.EnableDeviceVsync = !Device.EnableDeviceVsync;
         }
 
         protected override void OnMouseDown(MouseButtonEventArgs e)