diff --git a/anaconda/installclasses/qubes.py b/anaconda/installclasses/qubes.py
index 7452465..39e9335 100644
--- a/anaconda/installclasses/qubes.py
+++ b/anaconda/installclasses/qubes.py
@@ -48,6 +48,10 @@ class InstallClass(BaseInstallClass):
 
     bootloaderTimeoutDefault = 5
 
+    # Qubes comes preinstalled and does not support upgrade
+    showPackageSelection = False
+    showUpgrade = False
+
     tasks = [(N_("Minimal"), ["core", "qubes"]),
              (N_("Desktop"),
               ["backup-client", "base", "compat-libraries", "fonts",
diff --git a/anaconda/iw/task_gui.py b/anaconda/iw/task_gui.py
index 445d2fb..417a3fa 100644
--- a/anaconda/iw/task_gui.py
+++ b/anaconda/iw/task_gui.py
@@ -703,5 +703,4 @@ class TaskWindow(InstallWindow):
         self.xml.get_widget("addRepoButton").connect("clicked", self._addRepo)
         self.xml.get_widget("editRepoButton").connect("clicked", self._editRepo, self.rs)
 
-        #return vbox
-        return None
+        return vbox