diff --git a/0003-workaround-gsapprow-gtk_widget_measure-error-flood.patch b/0003-workaround-gsapprow-gtk_widget_measure-error-flood.patch
new file mode 100644
index 0000000..0a24881
--- /dev/null
+++ b/0003-workaround-gsapprow-gtk_widget_measure-error-flood.patch
@@ -0,0 +1,39 @@
+diff -up gnome-software-42.beta/src/gs-app-row.ui.3 gnome-software-42.beta/src/gs-app-row.ui
+--- gnome-software-42.beta/src/gs-app-row.ui.3	2022-02-10 20:53:14.109477000 +0100
++++ gnome-software-42.beta/src/gs-app-row.ui	2022-02-16 17:49:02.583817963 +0100
+@@ -26,7 +26,7 @@
+             <property name="valign">center</property>
+             <child>
+               <object class="GtkLabel" id="name_label">
+-                <property name="wrap">True</property>
++                <property name="wrap">False</property>
+                 <property name="xalign">0.0</property>
+                 <property name="yalign">0.5</property>
+                 <property name="ellipsize">end</property>
+@@ -80,7 +80,7 @@
+                     <property name="visible">False</property>
+                     <property name="xalign">0.0</property>
+                     <property name="yalign">0.5</property>
+-                    <property name="wrap">True</property>
++                    <property name="wrap">False</property>
+                     <property name="wrap-mode">word-char</property>
+                     <property name="ellipsize">end</property>
+                     <property name="lines">2</property>
+@@ -119,7 +119,7 @@
+                 <property name="vexpand">True</property>
+                 <property name="margin_start">24</property>
+                 <property name="margin_end">24</property>
+-                <property name="wrap">True</property>
++                <property name="wrap">False</property>
+                 <property name="wrap-mode">word-char</property>
+                 <property name="ellipsize">end</property>
+                 <property name="lines">2</property>
+@@ -187,7 +187,7 @@
+                     <property name="visible">False</property>
+                     <property name="label">warning-text</property>
+                     <property name="halign">start</property>
+-                    <property name="wrap">True</property>
++                    <property name="wrap">False</property>
+                     <property name="xalign">0</property>
+                     <attributes>
+                       <attribute name="weight" value="bold"/>
diff --git a/gnome-software.spec b/gnome-software.spec
index b30cd16..280f9df 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -22,6 +22,7 @@ Source0:   https://download.gnome.org/sources/gnome-software/42/%{name}-%{tarbal
 
 Patch01:   0001-crash-with-broken-theme.patch
 Patch02:   0002-packagekit-crash-on-app-install.patch
+Patch03:   0003-workaround-gsapprow-gtk_widget_measure-error-flood.patch
 
 BuildRequires: appstream-devel >= %{appstream_version}
 BuildRequires: gcc
@@ -103,7 +104,7 @@ and update software in the GNOME desktop.
 This package includes the rpm-ostree backend.
 
 %prep
-%autosetup -p1 -n %{name}-%{tarball_version}
+%autosetup -p1 -S gendiff -n %{name}-%{tarball_version}
 
 %build
 %meson \
@@ -200,6 +201,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %changelog
 * Wed Feb 16 2022 Milan Crha <mcrha@redhat.com> - 42.beta-2
 - Resolves: #2054939 (Crash on a PackageKit app install)
+- Add a temporary workaround for gtk_widget_measure error flood on GsAppRow
 
 * Fri Feb 11 2022 Milan Crha <mcrha@redhat.com> - 42.beta-1
 - Update to 42.beta