diff --git a/lib/twitter_api.rb b/lib/twitter_api.rb
index 5f6a6bfb29..96c3e96bae 100644
--- a/lib/twitter_api.rb
+++ b/lib/twitter_api.rb
@@ -66,15 +66,15 @@ class TwitterApi
 
     def link_hashtags_in(text)
       text.scan(/(?:^|\s)#(\w+)/).flatten.uniq.each do |hashtag|
-        text.gsub!("##{hashtag}", [
-          "<a href='https://twitter.com/search?q=%23#{hashtag}' ",
+        text.gsub!(/(?:^|\s)##{hashtag}/, [
+          " <a href='https://twitter.com/search?q=%23#{hashtag}' ",
           "target='_blank'>",
             "##{hashtag}",
           "</a>"
         ].join)
       end
 
-      text
+      text.strip
     end
 
     def user_timeline_uri_for(screen_name)