diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 2eef2bf898..634e7f2d06 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -3810,7 +3810,8 @@ indicator_set_fade (Indicator *indicator,
     {
       indicator->conceil_timer = g_timeout_add (INDICATOR_FADE_OUT_TIME, maybe_hide_indicator, indicator);
     }
-  if (!visible && gtk_widget_get_mapped (indicator->scrollbar))
+  if (!visible && gtk_widget_get_mapped (indicator->scrollbar) &&
+      indicator->conceil_timer != 0)
     {
       g_source_remove (indicator->conceil_timer);
       indicator->conceil_timer = 0;