diff --git a/gtk/gtkvideo.c b/gtk/gtkvideo.c
index 9f3eb43d94..d2cb23321a 100644
--- a/gtk/gtkvideo.c
+++ b/gtk/gtkvideo.c
@@ -545,6 +545,11 @@ gtk_video_notify_cb (GtkMediaStream *stream,
     gtk_video_update_error (self);
   if (g_str_equal (pspec->name, "playing"))
     gtk_video_update_playing (self);
+  if (g_str_equal (pspec->name, "prepared"))
+    {
+      if (self->autoplay && gtk_media_stream_is_prepared (stream))
+        gtk_media_stream_play (stream);
+    }
 }
 
 /**