--- a/find-daemon.glade
+++ b/find-daemon.glade
@@ -112,6 +112,7 @@
                   <object class="GtkEntry" id="vsyncthing_binary">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="sensitive">False</property>
                     <property name="margin_right">20</property>
                     <signal name="changed" handler="cb_check_value" swapped="no"/>
                   </object>
@@ -126,6 +127,7 @@
                     <property name="label" translatable="yes">_Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="sensitive">False</property>
                     <property name="receives_default">True</property>
                     <property name="use_underline">True</property>
                     <property name="yalign">0.51999998092651367</property>
--- a/syncthing_gtk/configuration.py
+++ b/syncthing_gtk/configuration.py
@@ -168,6 +168,8 @@
 			yield k
 	
 	def get(self, key):
+		if key == "syncthing_binary":
+			return self.REQUIRED_KEYS[key][1]
 		return self.values[key]
 	
 	def set(self, key, value):
--- a/syncthing_gtk/finddaemondialog.py
+++ b/syncthing_gtk/finddaemondialog.py
@@ -163,7 +163,7 @@
 		self["lblDownloadProgress"].set_markup(_("Download failed."))
 		self["btDownload"].set_visible(True)
 		self["pbDownload"].set_visible(False)
-		self["vsyncthing_binary"].set_sensitive(True)
+		self["vsyncthing_binary"].set_sensitive(False)
 		self["btBrowse"].set_sensitive(True)
 		self["btSave"].set_sensitive(True)
 	
@@ -179,7 +179,7 @@
 	
 	def cb_extract_finished(self, downloader, *a):
 		""" Called after extraction is finished """
-		self["vsyncthing_binary"].set_sensitive(True)
+		self["vsyncthing_binary"].set_sensitive(False)
 		self["btBrowse"].set_sensitive(True)
 		self["vsyncthing_binary"].set_text(downloader.get_target())
 		self["lblDownloadProgress"].set_markup("<b>" + _("Download finished.") + "</b>")
--- a/syncthing_gtk/wizard.py
+++ b/syncthing_gtk/wizard.py
@@ -60,7 +60,6 @@
 		self.quit_button.connect("clicked", lambda *a : self.emit("cancel"))
 		# Pages
 		self.add_page(IntroPage(self))
-		self.add_page(FindDaemonPage())
 		self.add_page(GenerateKeysPage())
 		self.add_page(HttpSettingsPage())
 		self.add_page(SaveSettingsPage())
--- a/ui-settings.glade
+++ b/ui-settings.glade
@@ -943,6 +943,7 @@
                     <property name="label" translatable="yes">_Browse...</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="sensitive">False</property>
                     <property name="receives_default">True</property>
                     <property name="use_underline">True</property>
                     <property name="yalign">0.51999998092651367</property>
@@ -974,6 +975,7 @@
                   <object class="GtkEntry" id="vsyncthing_binary">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="sensitive">False</property>
                     <property name="hexpand">True</property>
                     <signal name="changed" handler="cb_check_value" swapped="no"/>
                   </object>