diff --git a/app/views/base/chatDom.scala.html b/app/views/base/chatDom.scala.html
index 17ba702cd8..e7de91f520 100644
--- a/app/views/base/chatDom.scala.html
+++ b/app/views/base/chatDom.scala.html
@@ -23,7 +23,7 @@
     </div>
     @if(withNotes) {
     <div class="notes">
-      <textarea id="notes" placeholder="Type notes here."></textarea>
+      <textarea placeholder="Type notes here."></textarea>
     </div>
     }
   </div>
diff --git a/public/javascripts/big.js b/public/javascripts/big.js
index 4d7c23dda7..0d2d3d057f 100644
--- a/public/javascripts/big.js
+++ b/public/javascripts/big.js
@@ -934,6 +934,7 @@ var storage = {
       });
       var $form = self.element.find('form');
       var $input = self.element.find('input.lichess_say');
+      var $menu = self.element.siblings('.chat_menu');
 
       // send a message
       $form.submit(function() {
@@ -954,7 +955,7 @@ var storage = {
       });
 
       // toggle the chat
-      var $toggle = self.element.parent().find('input.toggle_chat');
+      var $toggle = $menu.find('input.toggle_chat');
       $toggle.change(function() {
         var enabled = $toggle.is(':checked');
         self.element.toggleClass('hidden', !enabled);
@@ -968,14 +969,14 @@ var storage = {
       if (self.options.messages.length > 0) self._appendMany(self.options.messages);
 
       // Toggle Notes/Chat display
-      $panels = $('div.chat_panels > div');
-      $('div.chat_menu').on('click', 'a', function() {
+      $panels = self.element.find('div.chat_panels > div');
+      $menu.on('click', 'a', function() {
         var panel = $(this).data('panel');
         $(this).siblings('.active').removeClass('active').end().addClass('active');
         $panels.removeClass('active').filter('.' + panel).addClass('active');
       }).find('a:first').click();
 
-      $notes = $('#notes');
+      $notes = self.element.find('.notes textarea');
 
       var data = lichess.analyse ? lichess.analyse.data : (lichess.round ? lichess.round.data : false);