diff --git a/use-correct-model-when-running-from-commands-history.patch b/use-correct-model-when-running-from-commands-history.patch
new file mode 100644
index 0000000..66d0b56
--- /dev/null
+++ b/use-correct-model-when-running-from-commands-history.patch
@@ -0,0 +1,13 @@
+diff --git a/src/appfinder-window.c b/src/appfinder-window.c
+index 0c39c176fb9bd699a451b2df2c2dcd67ed327858..e4c2a139a153baecb3c7f11d9fff8821bc743ed2 100644
+--- a/src/appfinder-window.c
++++ b/src/appfinder-window.c
+@@ -1925,7 +1925,7 @@ xfce_appfinder_window_execute (XfceAppfinderWindow *window,
+           xfce_appfinder_window_update_frecency (window, model, uri);
+           if (!result && regular_command)
+             {
+-              gtk_tree_model_get (model, &child_iter, XFCE_APPFINDER_MODEL_COLUMN_COMMAND, &cmd, -1);
++              gtk_tree_model_get (GTK_TREE_MODEL (window->model), &child_iter, XFCE_APPFINDER_MODEL_COLUMN_COMMAND, &cmd, -1);
+               result = xfce_appfinder_window_execute_command (cmd, screen, window, FALSE, NULL, &error);
+               g_free (cmd);
+             }
diff --git a/xfce4-appfinder.spec b/xfce4-appfinder.spec
index 6af053d..315142f 100644
--- a/xfce4-appfinder.spec
+++ b/xfce4-appfinder.spec
@@ -2,13 +2,15 @@
 
 Name:           xfce4-appfinder
 Version:        4.18.0
-Release:        1
+Release:        2
 Summary:        Appfinder for the Xfce4 Desktop Environment
 
 License:        GPLv2+
 URL:            http://www.xfce.org/
 Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2
 
+Patch0:         use-correct-model-when-running-from-commands-history.patch
+
 BuildRequires:  make
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.84
@@ -27,6 +29,7 @@ xfce-appfinder shows system wide installed applications.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # fix icon problems - GTK-3.10+
 sed -i 's/gtk-find/edit-find/g' data/xfce4-appfinder.desktop.in
@@ -59,6 +62,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.xfce.%{nam
 %{_metainfodir}/org.xfce.%{name}.appdata.xml
 
 %changelog
+* Fri Jan 13 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.18.0-2
+- Add upstream patch to fix command history segmentation fault
+
 * Wed Jan 04 2023 misaka00251 <liuxin@iscas.ac.cn> - 4.18.0-1
 - Update to 4.18.0