diff --git a/src/chat_control.py b/src/chat_control.py
index 66a9103b2..a44fd4dfc 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -2230,9 +2230,13 @@ class ChatControl(ChatControlBase):
                     if gajim.config.get('video_see_self'):
                         fixed = self.xml.get_object('outgoing_fixed')
                         fixed.set_no_show_all(False)
+                        video_hbox.show_all()
+                        out_xid = self.xml.get_object('outgoing_drawingarea').\
+                            window.xid
+                    else:
+                        out_xid = None
                     video_hbox.show_all()
                     in_xid = self.xml.get_object('incoming_drawingarea').window.xid
-                    out_xid = self.xml.get_object('outgoing_drawingarea').window.xid
                     sid = gajim.connections[self.account].start_video(
                         self.contact.get_full_jid(), in_xid, out_xid)
                 else:
diff --git a/src/dialogs.py b/src/dialogs.py
index 1d4f934cb..992456b9b 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -5319,11 +5319,18 @@ class VoIPCallReceivedDialog(object):
                 if gajim.config.get('video_see_self'):
                     out_xid = ctrl.xml.get_object('outgoing_drawingarea').\
                         window.xid
-                    b = content.pipeline.get_by_name('bin2')
-                    c = b.get_by_name('autovideosink0')
-                    d = c.get_by_name('autovideosink0-actual-sink-xvimage')
-                    d.set_xwindow_id(out_xid)
-                    content.out_xid = out_xid
+                    b = content.src_bin
+                    found = False
+                    for e in b.elements():
+                        if e.get_name().startswith('autovideosink'):
+                            found = True
+                            break
+                    if found:
+                        found = False
+                        for f in e.elements():
+                            if f.get_name().startswith('autovideosink'):
+                                f.set_xwindow_id(out_xid)
+                                content.out_xid = out_xid
                 content.in_xid = in_xid
                 ctrl.set_video_state('connecting', self.sid)
             # Now, accept the content/sessions.