diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index 4db546651dd..be574acc8c7 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:
+{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:
 
 buildPythonApplication rec {
-  version = "0.9.3.1";
+  version = "0.9.4";
   name = "syncthing-gtk-${version}";
 
   src = fetchFromGitHub {
     owner = "syncthing";
     repo = "syncthing-gtk";
     rev = "v${version}";
-    sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb";
+    sha256 = "0d3rjd1xjd7zravks9a2ph7gv1cm8wxaxkkvl1fvcx15v7f3hff9";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,10 @@ buildPythonApplication rec {
   ];
 
   patches = [
-    ./disable-syncthing-binary-configuration.patch
+    (fetchpatch {
+      url = https://github.com/syncthing/syncthing-gtk/commit/b2535e5a9cdb31c4987ab7af37f62d58d38255b7.patch;
+      sha256 = "047v79wz2a9334gbzywlqwpacrk53s26ksvfqaddk06avv8742w7";
+    })
     (substituteAll {
       src = ./paths.patch;
       killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall";
@@ -37,6 +40,8 @@ buildPythonApplication rec {
     })
   ];
 
+  setupPyBuildFlags = [ "build_py" "--nofinddaemon" "--nostdownloader" ];
+
   postPatch = ''
     substituteInPlace setup.py --replace "version = get_version()" "version = '${version}'"
     substituteInPlace scripts/syncthing-gtk --replace "/usr/share" "$out/share"
@@ -48,9 +53,9 @@ buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "GTK3 & python based GUI for Syncthing";
-    maintainers = with maintainers; [ ];
-    platforms = syncthing.meta.platforms;
     homepage = https://github.com/syncthing/syncthing-gtk;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ ];
+    platforms = syncthing.meta.platforms;
   };
 }
diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
deleted file mode 100644
index 14c2b62e6e3..00000000000
--- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/glade/find-daemon.glade
-+++ b/glade/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/glade/ui-settings.glade
-+++ b/glade/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>
---- 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())