diff --git a/features/embedder.feature b/features/embedder.feature
index 9db04a389..5b4145430 100644
--- a/features/embedder.feature
+++ b/features/embedder.feature
@@ -17,3 +17,9 @@ Feature: embedding
       When I follow "Youtube: Leekspin"
       And I wait for the ajax to finish
       Then I should see "Watch this video on YouTube" within ".video-container"
+
+      #After ajax aspect switch
+      When I follow "Besties" 
+      And I wait for the ajax to finish
+      And I follow "Youtube: Leekspin"
+      Then I should see "Watch this video on YouTube" within ".video-container"
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index 543a52c3e..3ee9b93d5 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -9,7 +9,7 @@ var Stream = {
 
     $(".status_message_delete").tipsy({trigger: 'hover', gravity: 'n'});
 
-    Diaspora.widgets.subscribe("stream/reloaded", Stream.initialized);
+    Diaspora.widgets.subscribe("stream/reloaded", Stream.initialize);
     Diaspora.widgets.timeago.updateTimeAgo();
     Diaspora.widgets.directionDetector.updateBinds();
 
@@ -96,7 +96,7 @@ var Stream = {
       Diaspora.widgets.alert.alert('Failed to post message!');
     });
 
-    $(".stream").find(".comment_delete", ".comment").live('ajax:success', function(data, html, xhr) {
+    $stream.find(".comment_delete", ".comment").live('ajax:success', function(data, html, xhr) {
       var element = $(this),
           target = element.parents(".comment"),
           post = element.closest('.stream_element'),
diff --git a/public/javascripts/widgets/embedder.js b/public/javascripts/widgets/embedder.js
index fad3fc018..3519339ba 100644
--- a/public/javascripts/widgets/embedder.js
+++ b/public/javascripts/widgets/embedder.js
@@ -52,7 +52,7 @@
   };
 
   Embedder.prototype.start = function() {
-    $(".stream").delegate("a.video-link", "click", this.onVideoLinkClicked);
+    $("#main_stream a.video-link").live("click", this.onVideoLinkClicked);
     this.registerServices();
 
     var $post = $("#main_stream").children(".stream_element:first"),
@@ -63,7 +63,7 @@
 
   Embedder.prototype.registerServices = function() {
     var watchVideoOn = Diaspora.widgets.i18n.t("videos.watch");
-    
+
     this.register("youtube.com",
         '<a href="//www.youtube.com/watch?v={{video-id}}" target="_blank">' + $.mustache(watchVideoOn, { provider: "YouTube" }) + '</a><br />' +
         '<iframe class="youtube-player" type="text/html" src="http://www.youtube.com/embed/{{video-id}}?wmode=opaque"></iframe>');