diff --git a/grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch b/grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
index 87e057c..ee0677d 100644
--- a/grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
+++ b/grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
@@ -144,7 +144,15 @@ Index: grub-2.04/grub-core/gfxmenu/view.c
  
  static void
  init_terminal (grub_gfxmenu_view_t view);
-@@ -142,6 +143,7 @@ grub_gfxmenu_view_destroy (grub_gfxmenu_
+@@ -103,6 +104,7 @@ grub_gfxmenu_view_new (const char *theme
+   view->title_text = grub_strdup (_("GRUB Boot Menu"));
+   view->progress_message_text = 0;
+   view->theme_path = 0;
++  view->menu_title_offset = 0;
+ 
+   /* Set the timeout bar's frame.  */
+   view->progress_message_frame.width = view->screen.width * 4 / 5;
+@@ -142,6 +144,7 @@ grub_gfxmenu_view_destroy (grub_gfxmenu_
    grub_free (view->title_text);
    grub_free (view->progress_message_text);
    grub_free (view->theme_path);
@@ -152,7 +160,7 @@ Index: grub-2.04/grub-core/gfxmenu/view.c
    if (view->canvas)
      view->canvas->component.ops->destroy (view->canvas);
    grub_free (view);
-@@ -410,6 +412,52 @@ grub_gfxmenu_set_chosen_entry (int entry
+@@ -410,6 +413,52 @@ grub_gfxmenu_set_chosen_entry (int entry
    grub_gfxmenu_redraw_menu (view);
  }
  
diff --git a/grub2.changes b/grub2.changes
index edf1b77..63c067d 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 28 15:16:37 UTC 2021 - Michael Chang <mchang@suse.com>
+
+- Fix crash in launching gfxmenu without theme file (bsc#1186481)
+  * grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
+
 -------------------------------------------------------------------
 Tue May 11 02:14:06 UTC 2021 - Michael Chang <mchang@suse.com>