diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 3c55eb299..16c58d7ea 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -2,10 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-:javascript
-  $(function() {
-    $("span.post_scope").tipsy({trigger: 'hover', gravity: 'n'});
-  });
 
 .stream_element{:id => post.guid}
   - if user_signed_in?
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index ae0880a91..f0c810026 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -10,9 +10,11 @@ var Stream = {
     Diaspora.widgets.timeago.updateTimeAgo();
     Diaspora.widgets.directionDetector.updateBinds();
 
-    $(".status_message_delete").tipsy({
-      trigger: "hover",
-      gravity: "n"
+    $.each([".stream_element_delete", "span.post_scope"], function(idx, el){
+      $(el).tipsy({
+        trigger: "hover",
+        gravity: "n"
+      });
     });
     //audio links
     Stream.setUpAudioLinks();
diff --git a/public/javascripts/web-socket-receiver.js b/public/javascripts/web-socket-receiver.js
index 8f94b29e0..4f34ca60b 100644
--- a/public/javascripts/web-socket-receiver.js
+++ b/public/javascripts/web-socket-receiver.js
@@ -108,8 +108,9 @@ var WebSocketReceiver = {
         );
       }
 
-      var toggler = $('.toggle_post_comments', post);
+      var toggler = $('.toggle_post_comments', post).parent();
 
+      if(toggler.length > 0){
         if( !$(".comments", post).is(':visible') ) {
           toggler.click();
         }