diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py
index c82aef2..8db6f9b 100644
--- a/dangerzone/gui/main_window.py
+++ b/dangerzone/gui/main_window.py
@@ -101,7 +101,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def vm_started(self):
         self.waiting_widget.hide()
-        self.doc_selection_widget.show
+        self.doc_selection_widget.show()
 
     def document_selected(self):
         self.doc_selection_widget.hide()
diff --git a/dangerzone/gui/settings_widget.py b/dangerzone/gui/settings_widget.py
index 4fca7a5..c5d0ed7 100644
--- a/dangerzone/gui/settings_widget.py
+++ b/dangerzone/gui/settings_widget.py
@@ -212,13 +212,14 @@ class SettingsWidget(QtWidgets.QWidget):
             "ocr", self.ocr_checkbox.checkState() == QtCore.Qt.Checked
         )
         self.global_common.settings.set("ocr_language", self.ocr_combobox.currentText())
-        if platform.system() != "Windows":
+        if platform.system() == "Darwin" or platform.system() == "Linux":
             self.global_common.settings.set(
                 "open", self.open_checkbox.checkState() == QtCore.Qt.Checked
             )
-            self.global_common.settings.set(
-                "open_app", self.open_combobox.currentText()
-            )
+            if platform.system() == "Linux":
+                self.global_common.settings.set(
+                    "open_app", self.open_combobox.currentText()
+                )
         self.global_common.settings.set(
             "update_container", self.update_checkbox.checkState() == QtCore.Qt.Checked
         )
diff --git a/dangerzone/gui/vm.py b/dangerzone/gui/vm.py
index ac28567..8ef2f57 100644
--- a/dangerzone/gui/vm.py
+++ b/dangerzone/gui/vm.py
@@ -218,11 +218,7 @@ class Vm(QtCore.QObject):
         ]
         args_str = " ".join(pipes.quote(s) for s in args)
         print("> " + args_str)
-        self.hyperkit_p = subprocess.Popen(
-            args,
-            # stdout=sys.stdout,
-            # stderr=subprocess.STDOUT,
-        )
+        self.hyperkit_p = subprocess.Popen(args)
 
         # Get the sshd PID
         with open(self.sshd_pid_path) as f:
@@ -240,11 +236,11 @@ class Vm(QtCore.QObject):
 
     def vm_connected(self):
         self.state = self.STATE_ON
-        self.vm_state_change.emit()
+        self.vm_state_change.emit(self.state)
 
     def vm_timeout(self):
         self.state = self.STATE_FAIL
-        self.vm_state_change.emit()
+        self.vm_state_change.emit(self.state)
 
     def restart(self):
         self.stop()
@@ -293,12 +289,25 @@ class WaitForSsh(QtCore.QThread):
 
     def run(self):
         # Wait for the SSH port to be open
+        success = False
         timeout_seconds = 45
-        sock = socket.socket()
-        sock.settimeout(timeout_seconds)
-        try:
-            sock.connect(("127.0.0.1", int(self.ssh_port)))
+        start_ts = time.time()
+        while True:
+            sock = socket.socket()
+            try:
+                sock.connect(("127.0.0.1", int(self.ssh_port)))
+                sock.close()
+                success = True
+                print("ssh port open!")
+                break
+            except Exception:
+                print("ssh port closed ...")
+                pass
+
+            time.sleep(2)
+            if time.time() - start_ts >= timeout_seconds:
+                self.timeout.emit()
+                break
+
+        if success:
             self.connected.emit()
-            sock.close()
-        except socket.timeout:
-            self.timeout.emit()