diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py
index beb4f9e..c872b5f 100755
--- a/qubesmanager/settings.py
+++ b/qubesmanager/settings.py
@@ -289,6 +289,12 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
         else:
             self.run_in_debug_mode.setVisible(False)
 
+        if hasattr(self.vm, 'seamless_gui_mode'):
+            self.seamless_gui.setVisible(True)
+            self.seamless_gui.setChecked(self.vm.seamless_gui_mode)
+        else:
+            self.seamless_gui.setVisible(False)
+
         #type
         self.type_label.setText(self.vm.type)
 
@@ -399,6 +405,14 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
         except Exception as ex:
             msg.append(str(ex))
 
+        try:
+            if self.seamless_gui.isVisible():
+                if self.vm.seamless_gui_mode != self.seamless_gui.isChecked():
+                    self.vm.seamless_gui_mode = self.seamless_gui.isChecked()
+                    self.anything_changed = True
+        except Exception as ex:
+            msg.append(str(ex))
+
         #max priv storage
         priv_size = self.max_priv_storage.value()
         if self.priv_img_size != priv_size:
diff --git a/settingsdlg.ui b/settingsdlg.ui
index 93ea09f..e448740 100644
--- a/settingsdlg.ui
+++ b/settingsdlg.ui
@@ -29,7 +29,7 @@
         <locale language="English" country="UnitedStates"/>
        </property>
        <property name="currentIndex">
-        <number>2</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="basic_tab">
         <property name="locale">
@@ -119,6 +119,13 @@
               </item>
              </layout>
             </item>
+            <item row="4" column="0">
+             <widget class="QCheckBox" name="seamless_gui">
+              <property name="text">
+               <string>Seamless GUI</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>
@@ -131,6 +138,9 @@
             <string>General</string>
            </property>
            <layout class="QFormLayout" name="formLayout_4">
+            <property name="fieldGrowthPolicy">
+             <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+            </property>
             <item row="0" column="0">
              <widget class="QLabel" name="label_13">
               <property name="text">