diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c
index 6ed54ab3e8..45a02b2656 100644
--- a/gfx/gfx_display.c
+++ b/gfx/gfx_display.c
@@ -621,20 +621,6 @@ void gfx_display_scissor_begin(void *userdata,
    }
 }
 
-/* End scissoring operation */
-void gfx_display_scissor_end(
-      void *userdata,
-      unsigned video_width,
-      unsigned video_height
-      )
-{
-   gfx_display_t            *p_disp  = disp_get_ptr();
-   gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
-   if (dispctx && dispctx->scissor_end)
-      dispctx->scissor_end(userdata,
-            video_width, video_height);
-}
-
 font_data_t *gfx_display_font_file(
       char* fontpath, float menu_font_size, bool is_threaded)
 {
diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h
index 9154ea74d0..8699459cea 100644
--- a/gfx/gfx_display.h
+++ b/gfx/gfx_display.h
@@ -252,7 +252,6 @@ font_data_t *gfx_display_font(
       bool video_is_threaded);
 
 void gfx_display_scissor_begin(void *data, unsigned video_width, unsigned video_height, int x, int y, unsigned width, unsigned height);
-void gfx_display_scissor_end(void *data, unsigned width, unsigned height);
 
 void gfx_display_font_free(font_data_t *font);
 
diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c
index 210292ba66..39582f3351 100644
--- a/gfx/gfx_widgets.c
+++ b/gfx/gfx_widgets.c
@@ -1165,8 +1165,9 @@ static void gfx_widgets_draw_task_msg(
    {
       gfx_widgets_flush_text(video_width, video_height,
             &p_dispwidget->gfx_widget_fonts.msg_queue);
-      gfx_display_scissor_end(userdata,
-            video_width, video_height);
+      if (dispctx && dispctx->scissor_end)
+         dispctx->scissor_end(userdata,
+               video_width, video_height);
    }
 
    /* Progress text */
@@ -1276,8 +1277,9 @@ static void gfx_widgets_draw_regular_msg(
       gfx_widgets_flush_text(video_width, video_height, &p_dispwidget->gfx_widget_fonts.bold);
       gfx_widgets_flush_text(video_width, video_height, &p_dispwidget->gfx_widget_fonts.msg_queue);
 
-      gfx_display_scissor_end(userdata,
-            video_width, video_height);
+      if (dispctx && dispctx->scissor_end)
+         dispctx->scissor_end(userdata,
+               video_width, video_height);
    }
 
    if (p_dispwidget->msg_queue_has_icons)
diff --git a/gfx/widgets/gfx_widget_achievement_popup.c b/gfx/widgets/gfx_widget_achievement_popup.c
index d850df2a59..ff571f3b9e 100644
--- a/gfx/widgets/gfx_widget_achievement_popup.c
+++ b/gfx/widgets/gfx_widget_achievement_popup.c
@@ -238,8 +238,9 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
       {
          gfx_widgets_flush_text(video_width, video_height,
             &p_dispwidget->gfx_widget_fonts.regular);
-         gfx_display_scissor_end(video_info->userdata,
-            video_width, video_height);
+         if (dispctx && dispctx->scissor_end)
+            dispctx->scissor_end(video_info->userdata,
+                  video_width, video_height);
       }
    }
 
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index b1e6683cce..bf29a010fd 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -2653,6 +2653,8 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
    bool input_menu_swap_ok_cancel_buttons = video_info->input_menu_swap_ok_cancel_buttons;
    bool battery_level_enable              = video_info->battery_level_enable;
    bool timedate_enable                   = video_info->timedate_enable;
+   gfx_display_t            *p_disp       = disp_get_ptr();
+   gfx_display_ctx_driver_t *dispctx      = p_disp->dispctx;
 
 #if 0
    static bool reset                      = false;
@@ -2808,9 +2810,9 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
             libretro_running,
             menu_framebuffer_opacity);
 
-   gfx_display_scissor_end(userdata,
-         video_width,
-         video_height);
+   if (dispctx && dispctx->scissor_end)
+      dispctx->scissor_end(userdata,
+            video_width, video_height);
 
    /* Flush first layer of text */
    ozone_font_flush(video_width, video_height, &ozone->fonts.footer);
diff --git a/menu/drivers/ozone/ozone_sidebar.c b/menu/drivers/ozone/ozone_sidebar.c
index 6c11b28a98..5400b7f766 100644
--- a/menu/drivers/ozone/ozone_sidebar.c
+++ b/menu/drivers/ozone/ozone_sidebar.c
@@ -474,8 +474,9 @@ console_iterate:
 
    ozone_font_flush(video_width, video_height, &ozone->fonts.sidebar);
 
-   gfx_display_scissor_end(userdata, video_width,
-         video_height);
+   if (dispctx && dispctx->scissor_end)
+      dispctx->scissor_end(userdata,
+            video_width, video_height);
 }
 
 void ozone_go_to_sidebar(ozone_handle_t *ozone, uintptr_t tag)