diff --git a/0001-timer-Set-width-chars-2-property-on-the-spinbuttons.patch b/0001-timer-Set-width-chars-2-property-on-the-spinbuttons.patch
new file mode 100644
index 0000000..cb9321d
--- /dev/null
+++ b/0001-timer-Set-width-chars-2-property-on-the-spinbuttons.patch
@@ -0,0 +1,68 @@
+From 4f70df82ff3800c96fcf927f499e3273cc989c88 Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti@declera.com>
+Date: Tue, 18 Sep 2018 16:26:52 +0300
+Subject: [PATCH] timer: Set width-chars=2 property on the spinbuttons
+
+Set width-chars to help gtk pre-allocate the spin buttons
+drawing area regardless of font
+
+Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1630248
+---
+ data/ui/timer.ui | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/data/ui/timer.ui b/data/ui/timer.ui
+index 40ff931..7c37afe 100644
+--- a/data/ui/timer.ui
++++ b/data/ui/timer.ui
+@@ -67,6 +67,7 @@
+                     <property name="orientation">vertical</property>
+                     <property name="adjustment">adjustment_hours</property>
+                     <property name="numeric">True</property>
++                    <property name="width_chars">2</property>
+                     <property name="wrap">True</property>
+                     <signal name="output" handler="show_leading_zeros" swapped="no"/>
+                     <signal name="changed" handler="update_start_button" swapped="no"/>
+@@ -109,6 +110,7 @@
+                     <property name="orientation">vertical</property>
+                     <property name="adjustment">adjustment_minutes</property>
+                     <property name="numeric">True</property>
++                    <property name="width_chars">2</property>
+                     <property name="wrap">True</property>
+                     <signal name="output" handler="show_leading_zeros" swapped="no"/>
+                     <signal name="changed" handler="update_start_button" swapped="no"/>
+@@ -152,6 +154,7 @@
+                     <property name="orientation">vertical</property>
+                     <property name="adjustment">adjustment_seconds</property>
+                     <property name="numeric">True</property>
++                    <property name="width_chars">2</property>
+                     <property name="wrap">True</property>
+                     <signal name="output" handler="show_leading_zeros" swapped="no"/>
+                     <signal name="changed" handler="update_start_button" swapped="no"/>
+@@ -263,6 +266,7 @@
+                     <property name="orientation">vertical</property>
+                     <property name="adjustment">adjustment_hours</property>
+                     <property name="numeric">True</property>
++                    <property name="width_chars">2</property>
+                     <property name="wrap">True</property>
+                     <signal name="output" handler="show_leading_zeros" swapped="no"/>
+                     <signal name="changed" handler="update_start_button" swapped="no"/>
+@@ -306,6 +310,7 @@
+                     <property name="orientation">vertical</property>
+                     <property name="adjustment">adjustment_minutes</property>
+                     <property name="numeric">True</property>
++                    <property name="width_chars">2</property>
+                     <property name="wrap">True</property>
+                     <signal name="output" handler="show_leading_zeros" swapped="no"/>
+                     <signal name="changed" handler="update_start_button" swapped="no"/>
+@@ -349,6 +354,7 @@
+                     <property name="orientation">vertical</property>
+                     <property name="adjustment">adjustment_seconds</property>
+                     <property name="numeric">True</property>
++                    <property name="width_chars">2</property>
+                     <property name="wrap">True</property>
+                     <signal name="output" handler="show_leading_zeros" swapped="no"/>
+                     <signal name="changed" handler="update_start_button" swapped="no"/>
+-- 
+2.19.0
+
diff --git a/gnome-clocks.spec b/gnome-clocks.spec
index 90735f4..dccf7fb 100644
--- a/gnome-clocks.spec
+++ b/gnome-clocks.spec
@@ -2,13 +2,16 @@
 
 Name:           gnome-clocks
 Version:        3.30.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Clock application designed for GNOME 3
 
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Apps/Clocks
 Source0:        https://download.gnome.org/sources/gnome-clocks/3.30/%{name}-%{version}.tar.xz
 
+# https://gitlab.gnome.org/GNOME/gnome-clocks/merge_requests/5
+Patch1: 0001-timer-Set-width-chars-2-property-on-the-spinbuttons.patch
+
 BuildRequires:  meson
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -60,6 +63,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.clocks.d
 %{_datadir}/metainfo/org.gnome.clocks.appdata.xml
 
 %changelog
+* Tue Sep 18 2018 Yanko Kaneti <yaneti@declera.com> - 3.30.0-3
+- Fix timer visual glitch. Bug #1630248
+
 * Sun Sep  9 2018 Yanko Kaneti <yaneti@declera.com> - 3.30.0-2
 - Rebuild