diff --git a/src/snek/templates/app.html b/src/snek/templates/app.html
index 88a6335..185d22e 100644
--- a/src/snek/templates/app.html
+++ b/src/snek/templates/app.html
@@ -33,14 +33,7 @@
   </header>
   <main>
     {% block sidebar %}
-    <aside class="sidebar">
-      <h2 class="no-select">Channels</h2>
-      <ul>
-        {% for channel in channels %}
-        <li><a class="no-select" href="/channel/{{channel['uid']}}.html">{{channel['name']}}</a></li>
-        {% endfor %}
-      </ul>
-    </aside>
+    {% include "sidebar_channels.html" %}
     {% endblock %}
     {% block main %}
     <chat-window class="chat-area"></chat-window>
diff --git a/src/snek/templates/web.html b/src/snek/templates/web.html
index fb935c8..bdcddae 100644
--- a/src/snek/templates/web.html
+++ b/src/snek/templates/web.html
@@ -132,6 +132,7 @@
     app.addEventListener("channel-message", (data) => {
         if (data.channel_uid !== channelUid) {
             if(!isMentionForSomeoneElse(data.message)){
+                channelSidebar.notify(data);
                 app.playSound("messageOtherChannel");
             }
             
diff --git a/src/snek/view/web.py b/src/snek/view/web.py
index dda589f..5a3b264 100644
--- a/src/snek/view/web.py
+++ b/src/snek/view/web.py
@@ -52,7 +52,7 @@ class WebView(BaseView):
             other_user = await self.app.services.channel_member.get_other_dm_user(subscribed_channel["channel_uid"], self.session.get("uid"))
             if other_user:
                 item["name"] = other_user["nick"]
-                item["uid"] = other_user["uid"]
+                item["uid"] = subscribed_channel["channel_uid"]
             else:
                 item["name"] = subscribed_channel["label"]
                 item["uid"] = subscribed_channel["channel_uid"]