diff --git a/public/javascripts/aspect-filters.js b/public/javascripts/aspect-filters.js
index 19045700d..4a363cca6 100644
--- a/public/javascripts/aspect-filters.js
+++ b/public/javascripts/aspect-filters.js
@@ -48,7 +48,7 @@ var AspectFilters = {
 
     // select correct aspect in filter list & deselect others
     $("#aspect_nav li").removeClass('selected');
-    link.addClass('selected');
+    aspectLi.addClass('selected');
 
     AspectFilters.fadeOut();
 
@@ -168,14 +168,11 @@ var AspectFilters = {
         for(var key in photos){
           $("#publisher textarea").addClass("with_attachments");
           photos_html = photos_html + "<li style='position:relative;'> " + ("<img src='" + photos[key] +"' data-id='" + key + "'>") +  "</li>";
-        };
+        }
 
         // reinit listeners on stream
         photozone.html(photos_html);
-        Stream.initialize();
-        InfiniteScroll.initialize();
-
-        Publisher.initialize();
+        Diaspora.widgets.publish("stream/reloaded");
 
         // fade contents back in
         if(AspectFilters.requests == 0){
diff --git a/public/javascripts/infinite-scroll.js b/public/javascripts/infinite-scroll.js
index 68c158d90..fb6b341fa 100644
--- a/public/javascripts/infinite-scroll.js
+++ b/public/javascripts/infinite-scroll.js
@@ -24,12 +24,13 @@ var InfiniteScroll = {
   },
   postScrollCallbacks: [],
   initialize: function(){
+    Diaspora.widgets.subscribe("stream/reloaded", InfiniteScroll.initialize);
     $('#main_stream').infinitescroll(InfiniteScroll.options, InfiniteScroll.postScrollCallback);
   },
   postScroll: function( callback ){
     InfiniteScroll.postScrollCallbacks.push(callback);
   }
-}
+};
 
 $(document).ready(function() {
   InfiniteScroll.initialize();
diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js
index 89e215baa..ec0b816c5 100644
--- a/public/javascripts/publisher.js
+++ b/public/javascripts/publisher.js
@@ -346,10 +346,7 @@ var Publisher = {
     });
   },
   initialize: function() {
-    Publisher.cachedForm = false;
-    Publisher.cachedInput = false;
-    Publisher.cachedHiddenInput = false;
-    Publisher.cachedSubmit = false;
+    Diaspora.widgets.subscribe("stream/reloaded", Publisher.initialize);
 
     Publisher.bindServiceIcons();
     Publisher.bindPublicIcon();
@@ -357,7 +354,7 @@ var Publisher = {
 
     if ($("#status_message_fake_text").val() == "") {
       Publisher.close();
-    };
+    }
 
     Publisher.autocompletion.initialize();
     Publisher.hiddenInput().val(Publisher.input().val());
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index e5f3b5e37..2d5c2614f 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -6,12 +6,14 @@
 var Stream = {
   initialize: function() {
     var $stream = $(".stream");
-    var $publisher = $("#publisher");
 
     $(".status_message_delete").tipsy({trigger: 'hover', gravity: 'n'});
 
+    Diaspora.widgets.subscribe("stream/reloaded", Stream.initialized);
     Diaspora.widgets.timeago.updateTimeAgo();
     Diaspora.widgets.directionDetector.updateBinds();
+
+
     $stream.not(".show").delegate("a.show_post_comments", "click", Stream.toggleComments);
     //audio linx
     Stream.setUpAudioLinks();