diff --git a/osu.Game/Online/Chat/Channel.cs b/osu.Game/Online/Chat/Channel.cs
index ba410948cc..01685cc7dc 100644
--- a/osu.Game/Online/Chat/Channel.cs
+++ b/osu.Game/Online/Chat/Channel.cs
@@ -24,10 +24,10 @@ namespace osu.Game.Online.Chat
         [JsonProperty(@"channel_id")]
         public int Id;
 
-        public Bindable<bool> Joined = new Bindable<bool>();
-
         public readonly SortedList<Message> Messages = new SortedList<Message>(Comparer<Message>.Default);
 
+        public Bindable<bool> Joined = new Bindable<bool>();
+
         public bool ReadOnly => Name != "#lazer";
 
         public const int MAX_HISTORY = 300;
diff --git a/osu.Game/Overlays/Chat/ChannelListItem.cs b/osu.Game/Overlays/Chat/ChannelListItem.cs
index ba6818026e..cc9aacc643 100644
--- a/osu.Game/Overlays/Chat/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelListItem.cs
@@ -29,10 +29,10 @@ namespace osu.Game.Overlays.Chat
         private Color4? topicColour;
 
         public string[] FilterTerms => new[] { Channel.Name };
-        public bool MatchingCurrentFilter
-        {
+        public bool MatchingCurrentFilter
+        {
         	set
-            {
+            {
                 FadeTo(value ? 1f : 0f, 100);
             }
         }
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 7af37fb955..193b18dd12 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Overlays
 
             Children = new Drawable[]
             {
-                channelSelection = new ChannelSelectionOverlay
+                channelSelection = new ChannelSelectionOverlay //todo: temporary placement
                 {
                     Origin = Anchor.BottomLeft,
                     Height = 400,