diff --git a/org.xfce.Thunar/opendialog.patch b/org.xfce.Thunar/opendialog.patch
new file mode 100644
index 0000000..a22f1dc
--- /dev/null
+++ b/org.xfce.Thunar/opendialog.patch
@@ -0,0 +1,34 @@
+diff -rp thunar-1.8.1/thunar/thunar-chooser-dialog.c thunar-1.8.1~/thunar/thunar-chooser-dialog.c
+*** thunar-1.8.1/thunar/thunar-chooser-dialog.c	2018-06-14 03:44:32.000000000 +0200
+--- thunar-1.8.1~/thunar/thunar-chooser-dialog.c	2018-09-22 00:56:28.454964547 +0200
+*************** thunar_show_chooser_dialog (gpointer
+*** 1208,1218 ****
+      }
+  
+    /* display the chooser dialog */
+!   dialog = g_object_new (THUNAR_TYPE_CHOOSER_DIALOG,
+!                          "file", file,
+!                          "open", open,
+!                          "screen", screen,
+!                          NULL);
+  
+    /* check if we have a toplevel window */
+    if (G_LIKELY (window != NULL && gtk_widget_get_toplevel (window)))
+--- 1208,1214 ----
+      }
+  
+    /* display the chooser dialog */
+!   dialog = gtk_app_chooser_dialog_new(screen, 0, thunar_file_get_file(file));
+  
+    /* check if we have a toplevel window */
+    if (G_LIKELY (window != NULL && gtk_widget_get_toplevel (window)))
+*************** thunar_show_chooser_dialog (gpointer
+*** 1234,1240 ****
+    /* display the dialog */
+    gtk_widget_show (dialog);
+  }
+- 
+- 
+- 
+- 
+--- 1230,1232 ----
diff --git a/org.xfce.Thunar/org.xfce.Thunar.yaml b/org.xfce.Thunar/org.xfce.Thunar.yaml
new file mode 100644
index 0000000..b0ed4c1
--- /dev/null
+++ b/org.xfce.Thunar/org.xfce.Thunar.yaml
@@ -0,0 +1,109 @@
+id: org.xfce.Thunar
+runtime: org.gnome.Platform
+runtime-version: 3.28
+sdk: org.gnome.Sdk
+branch: master
+separate-locales: false
+
+modules:
+    -   name: xfce-dev-tools
+        sources:
+            -   type: archive
+                url: https://git.xfce.org/xfce/xfce4-dev-tools/snapshot/xfce4-dev-tools-4.12.0.tar.gz
+                sha256: a9ef192f0de6560b19831f1783d9e77d7e31dfd8c08e3e69c82754dbd3cca0a0
+    -   name: perl5
+        sources:
+            -   type: archive
+                url: https://www.cpan.org/src/5.0/perl-5.28.0.tar.gz
+                sha256: 7e929f64d4cb0e9d1159d4a59fc89394e27fa1f7004d0836ca0d514685406ea8
+            -   type: shell
+                commands:
+                    - ./Configure -des -Dprefix=/app
+        build-options:
+            no-debuginfo: true
+            strip: false
+        no-autogen: true
+        cleanup:
+            - "*"
+    -   name: perl5-moduels-xfce4util
+        build-options:
+            build-args:
+                - --share=network
+        buildsystem: simple
+        build-commands:
+            - cpan URI::Escape
+            - cpan URI::file
+            - cpan URI::URL
+        cleanup:
+            - "*"
+    -   name: xfce4util
+        sources:
+            -   type: archive
+                url: https://git.xfce.org/xfce/libxfce4util/snapshot/libxfce4util-4.13.2.tar.gz
+                sha256: 96a396df9ba3ca63e541e3b6f773dc17b0d03432049e9cab914cb5c0082b9821
+        config-opts:
+            - --enable-maintainer-mode
+    -   name: xfconf
+        sources:
+            -   type: archive
+                url: https://git.xfce.org/xfce/xfconf/snapshot/xfconf-4.13.5.tar.gz
+                sha256: b50e4e5cf9ed58aa556a38edf188f2ff9576389a345950b643f4113c6aea26de
+    -   name: xfce4ui
+        sources:
+            -   type: archive
+                url: https://git.xfce.org/xfce/libxfce4ui/snapshot/libxfce4ui-4.13.4.tar.gz
+                sha256: c8d4bd61f9f1e5afc0aa72f86e53483637dba52bf3412070705de7e130c42319
+        config-opts:
+            - --enable-maintainer-mode
+    -   name: exo
+        sources:
+            -   type: archive
+                url: https://git.xfce.org/xfce/exo/snapshot/exo-0.12.2.tar.gz
+                sha256: ef24f354305d48217da2926705208ef2ba3933e26699b9df6f88c6b33d871fde
+        config-opts:
+            - --enable-maintainer-mode
+    -   name: perl5-moduels-thunar
+        build-options:
+            build-args:
+                - --share=network
+            no-debuginfo: true
+            strip: false
+        buildsystem: simple
+        build-commands:
+            - cpan XML::Parser
+        cleanup:
+            - "*"
+    -   name: thunar
+        sources:
+            -   type: archive
+                url: https://git.xfce.org/xfce/thunar/snapshot/thunar-1.8.1.tar.gz
+                sha256: edc318cac77aa196e397a95b2aa635fd568660e016b3663b18d9b0e92d1cc9e0
+            -   type: patch
+                path: opendialog.patch
+        config-opts:
+            - --enable-maintainer-mode
+    -   name: fix-starter
+        buildsystem: simple
+        build-commands:
+            - mv /app/share/applications/Thunar.desktop .; rm -v /app/share/applications/*; mv Thunar.desktop /app/share/applications/org.xfce.Thunar.desktop
+            - bash -c "for x in /app/share/icons/hicolor/*/apps/Thunar.png; do mv -v \$x \${x%Thunar.png}org.xfce.Thunar.png; done"
+            - bash -c "for x in /app/share/icons/hicolor/*/apps/Thunar.svg; do mv -v \$x \${x%Thunar.svg}org.xfce.Thunar.svg; done"
+            - perl -pi -e s/Icon\\=Thunar/Icon\\=org\\.xfce\\.Thunar/g /app/share/applications/org.xfce.Thunar.desktop
+            - rm -v /app/bin/exo-open; echo "exec gio open \\$@" > /app/bin/exo-open; chmod +x /app/bin/exo-open
+cleanup:
+    - /include
+    - /lib/debug
+    - /lib/pkgconfig
+    - /lib/systemd
+    - /share/doc
+    - /share/man
+command: thunar
+finish-args:
+    - --filesystem=host
+    - --share=ipc
+    - --share=network
+    - --socket=x11
+    - --socket=wayland
+    - --device=all
+    - --own-name=org.xfce.FileManager
+    - --socket=system-bus
diff --git a/org.xfce.Thunar/thunar.sh b/org.xfce.Thunar/thunar.sh
new file mode 100644
index 0000000..8102f5a
--- /dev/null
+++ b/org.xfce.Thunar/thunar.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+/app/lib/xfce4/xfconf/xfconfd &
+sleep 1
+thunar