diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 4cfa91a97d..09e167dd4e 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1658,6 +1658,7 @@ gtk_label_query_tooltip (GtkWidget  *widget,
               if (link->title)
                 {
                   gtk_tooltip_set_markup (tooltip, link->title);
+                  return TRUE;
                 }
             }
         }
diff --git a/modules/media/gtkgstpaintable.c b/modules/media/gtkgstpaintable.c
index 5bd789c1f3..ab837382b8 100644
--- a/modules/media/gtkgstpaintable.c
+++ b/modules/media/gtkgstpaintable.c
@@ -192,20 +192,10 @@ gtk_gst_paintable_realize (GtkGstPaintable *self,
                            GdkSurface      *surface)
 {
   GError *error = NULL;
-  GtkNative *native;
-  GskRenderer *renderer;
 
   if (self->context)
     return;
 
-  native = gtk_native_get_for_surface (surface);
-  renderer = gtk_native_get_renderer (native);
-  if (!GSK_IS_GL_RENDERER (renderer))
-    {
-      GST_INFO ("not using GL with a %s renderer\n", G_OBJECT_TYPE_NAME (renderer));
-      return;
-    }
-
   self->context = gdk_surface_create_gl_context (surface, &error);
   if (self->context == NULL)
     {