diff --git a/src/ep.json b/src/ep.json
index da2bd8ad2..50c730e05 100644
--- a/src/ep.json
+++ b/src/ep.json
@@ -19,6 +19,10 @@
         "handleClientMessage_CHAT_MESSAGE": "ep_etherpad-lite/static/js/chat",
         "handleClientMessage_CHAT_MESSAGES": "ep_etherpad-lite/static/js/chat",
         "postAceInit": "ep_etherpad-lite/static/js/chat"
+      },
+      "hooks": {
+        "eejsBlock_mySettings": "ep_etherpad-lite/node/chat",
+        "eejsBlock_stickyContainer": "ep_etherpad-lite/node/chat"
       }
     },
     {
diff --git a/src/node/chat.js b/src/node/chat.js
new file mode 100644
index 000000000..02a863e9e
--- /dev/null
+++ b/src/node/chat.js
@@ -0,0 +1,44 @@
+'use strict';
+
+exports.eejsBlock_mySettings = (hookName, context) => {
+  context.content += `
+    <p class="hide-for-mobile">
+      <input type="checkbox" id="options-stickychat">
+      <label for="options-stickychat" data-l10n-id="pad.settings.stickychat"></label>
+    </p>
+    <p class="hide-for-mobile">
+      <input type="checkbox" id="options-chatandusers">
+      <label for="options-chatandusers" data-l10n-id="pad.settings.chatandusers"></label>
+    </p>
+  `;
+};
+
+exports.eejsBlock_stickyContainer = (hookName, context) => {
+  /* eslint-disable max-len */
+  context.content += `
+    <div id="chaticon" class="visible" title="Chat (Alt C)">
+      <span id="chatlabel" data-l10n-id="pad.chat"></span>
+      <span class="buttonicon buttonicon-chat"></span>
+      <span id="chatcounter">0</span>
+    </div>
+    <div id="chatbox">
+      <div class="chat-content">
+        <div id="titlebar">
+          <h1 id ="titlelabel" data-l10n-id="pad.chat"></h1>
+          <a id="titlecross" class="hide-reduce-btn">-&nbsp;</a>
+          <a id="titlesticky" class="stick-to-screen-btn" data-l10n-id="pad.chat.stick.title">█&nbsp;&nbsp;</a>
+        </div>
+        <div id="chattext" class="thin-scrollbar" aria-live="polite" aria-relevant="additions removals text" role="log" aria-atomic="false">
+          <div alt="loading.." id="chatloadmessagesball" class="chatloadmessages loadingAnimation" align="top"></div>
+          <button id="chatloadmessagesbutton" class="chatloadmessages" data-l10n-id="pad.chat.loadmessages"></button>
+        </div>
+        <div id="chatinputbox">
+          <form>
+            <textarea id="chatinput" maxlength="999" data-l10n-id="pad.chat.writeMessage.placeholder"></textarea>
+          </form>
+        </div>
+      </div>
+    </div>
+  `;
+  /* eslint-enable max-len */
+};
diff --git a/src/templates/pad.html b/src/templates/pad.html
index b1f033f59..84a99f3de 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -112,23 +112,15 @@
       </noscript>
     </div>
 
-    <!------------------------------------------------------------->
-    <!-- SETTINGS POPUP (change font, language, chat parameters) -->
-    <!------------------------------------------------------------->
+    <!-------------------------------------------->
+    <!-- SETTINGS POPUP (change font, language) -->
+    <!-------------------------------------------->
 
     <div id="settings" class="popup">
       <div class="popup-content">
         <h1 data-l10n-id="pad.settings.padSettings"></h1>
         <% e.begin_block("mySettings"); %>
         <h2 data-l10n-id="pad.settings.myView"></h2>
-        <p class="hide-for-mobile">
-          <input type="checkbox" id="options-stickychat">
-          <label for="options-stickychat" data-l10n-id="pad.settings.stickychat"></label>
-        </p>
-        <p class="hide-for-mobile">
-          <input type="checkbox" id="options-chatandusers">
-          <label for="options-chatandusers" data-l10n-id="pad.settings.chatandusers"></label>
-        </p>
         <p>
           <input type="checkbox" id="options-colorscheck">
           <label for="options-colorscheck" data-l10n-id="pad.settings.colorcheck"></label>
@@ -336,6 +328,7 @@
     </div>
 
     <div class="sticky-container">
+      <% e.begin_block("stickyContainer"); %>
 
       <!---------------------------------------------------------------------->
       <!-- USERS POPUP (set username, color, see other users names & color) -->
@@ -370,35 +363,7 @@
           <% e.end_block(); %>
         </div>
       </div>
-
-      <!----------------------------->
-      <!----------- CHAT ------------>
-      <!----------------------------->
-
-      <div id="chaticon" class="visible" title="Chat (Alt C)">
-        <span id="chatlabel" data-l10n-id="pad.chat"></span>
-        <span class="buttonicon buttonicon-chat"></span>
-        <span id="chatcounter">0</span>
-      </div>
-
-      <div id="chatbox">
-        <div class="chat-content">
-          <div id="titlebar">
-            <h1 id ="titlelabel" data-l10n-id="pad.chat"></h1>
-            <a id="titlecross" class="hide-reduce-btn">-&nbsp;</a>
-            <a id="titlesticky" class="stick-to-screen-btn" data-l10n-id="pad.chat.stick.title">█&nbsp;&nbsp;</a>
-          </div>
-          <div id="chattext" class="thin-scrollbar" aria-live="polite" aria-relevant="additions removals text" role="log" aria-atomic="false">
-            <div alt="loading.." id="chatloadmessagesball" class="chatloadmessages loadingAnimation" align="top"></div>
-            <button id="chatloadmessagesbutton" class="chatloadmessages" data-l10n-id="pad.chat.loadmessages"></button>
-          </div>
-          <div id="chatinputbox">
-            <form>
-              <textarea id="chatinput" maxlength="999" data-l10n-id="pad.chat.writeMessage.placeholder"></textarea>
-            </form>
-          </div>
-        </div>
-      </div>
+      <% e.end_block(); %><!-- end stickyContainer -->
     </div>
 
     <!------------------------------------------------------------------>