diff --git a/src/m64py/frontend/settings.py b/src/m64py/frontend/settings.py
index 34d0dbf..7f1e3c8 100644
--- a/src/m64py/frontend/settings.py
+++ b/src/m64py/frontend/settings.py
@@ -241,6 +241,11 @@ class Settings(QDialog, Ui_Settings):
             bool(self.core.config.get_parameter("Fullscreen")))
         self.checkFullscreen.setEnabled(not self.parent.vidext)
 
+        self.checkVsync.setChecked(
+            bool(self.core.config.get_parameter("VerticalSync")))
+        self.checkVsync.setToolTip(
+            self.core.config.get_parameter_help("VerticalSync").decode())
+
         if sys.platform == "win32":
             self.checkKeepAspect.setChecked(False)
             self.checkKeepAspect.setEnabled(False)
@@ -339,6 +344,7 @@ class Settings(QDialog, Ui_Settings):
         self.core.config.set_parameter("ScreenWidth", int(width))
         self.core.config.set_parameter("ScreenHeight", int(height))
         self.core.config.set_parameter("Fullscreen", self.checkFullscreen.isChecked())
+        self.core.config.set_parameter("VerticalSync", self.checkVsync.isChecked())
         self.qset.setValue("keep_aspect", int(self.checkKeepAspect.isChecked()))
         self.qset.setValue("disable_screensaver", int(self.checkDisableScreenSaver.isChecked()))
         self.qset.setValue("enable_vidext", int(self.checkEnableVidExt.isChecked()))
diff --git a/src/m64py/ui/settings.ui b/src/m64py/ui/settings.ui
index b397c65..e617c8e 100644
--- a/src/m64py/ui/settings.ui
+++ b/src/m64py/ui/settings.ui
@@ -44,7 +44,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tab_1">
       <attribute name="title">
@@ -504,7 +504,7 @@ QGroupBox::title {
  }</string>
          </property>
          <property name="title">
-          <string>Resolution</string>
+          <string>Video</string>
          </property>
          <property name="flat">
           <bool>false</bool>
@@ -513,20 +513,7 @@ QGroupBox::title {
           <bool>false</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout_6">
-          <item row="1" column="1">
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>361</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="1" column="0">
+          <item row="3" column="0">
            <widget class="QComboBox" name="comboResolution">
             <property name="enabled">
              <bool>false</bool>
@@ -558,6 +545,26 @@ QGroupBox::title {
             </property>
            </widget>
           </item>
+          <item row="3" column="1">
+           <spacer name="horizontalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>361</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="checkVsync">
+            <property name="text">
+             <string>Vertical Sync</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>