diff --git a/app/helpers/conversations_helper.rb b/app/helpers/conversations_helper.rb
index f02492bc9..beac7dc4f 100644
--- a/app/helpers/conversations_helper.rb
+++ b/app/helpers/conversations_helper.rb
@@ -2,10 +2,9 @@
 
 module ConversationsHelper
   def conversation_class(conversation, unread_count, selected_conversation_id)
-    conv_class = unread_count > 0 ? "unread " : ""
-    if selected_conversation_id && conversation.id == selected_conversation_id
-      conv_class << "selected"
-    end
-    conv_class
+    conv_class = unread_count > 0 ? "unread" : ""
+    return conv_class unless selected_conversation_id && conversation.id == selected_conversation_id
+
+    "#{conv_class} selected"
   end
 end