diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 2c426130..c2da072c 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -1290,25 +1290,6 @@ u(document).on("drop", '#write', function(e) {
     }
 })
 
-u(document).on('submit', '#write > form', (e) => {
-    const target = u(e.target)
-    const horizontal_array = []
-    const horizontal_input = target.find(`input[name='horizontal_attachments']`)
-    const horizontal_attachments = target.find(`.post-horizontal > a`)
-    horizontal_attachments.nodes.forEach(_node => {
-        horizontal_array.push(`${_node.dataset.type}${_node.dataset.id}`)
-    })
-    horizontal_input.nodes[0].value = horizontal_array.join(',')
-
-    const vertical_array = []
-    const vertical_input = target.find(`input[name='vertical_attachments']`)
-    const vertical_attachments = target.find(`.post-vertical > .vertical-attachment`)
-    vertical_attachments.nodes.forEach(_node => {
-        vertical_array.push(`${_node.dataset.type}${_node.dataset.id}`)
-    })
-    vertical_input.nodes[0].value = vertical_array.join(',')
-})
-
 // !!! PHOTO PICKER !!!
 u(document).on("click", "#__photoAttachment", async (e) => {
     const photos_per_page = 23
diff --git a/Web/static/js/router.js b/Web/static/js/router.js
index 9390ef3f..15a3a757 100644
--- a/Web/static/js/router.js
+++ b/Web/static/js/router.js
@@ -297,6 +297,11 @@ u(document).on('submit', 'form', async (e) => {
         return false
     }
 
+    if(e.target.closest('#write')) {
+        const target = u(e.target)
+        collect_attachments_node(target)
+    }
+
     u('#ajloader').addClass('shown')
 
     const form = e.target
diff --git a/Web/static/js/utils.js b/Web/static/js/utils.js
index 9c9c987d..95c25fe3 100644
--- a/Web/static/js/utils.js
+++ b/Web/static/js/utils.js
@@ -260,3 +260,22 @@ function sleep(time)
 {
     return new Promise((resolve) => setTimeout(resolve, time));
 }
+
+function collect_attachments_node(target) 
+{
+    const horizontal_array = []
+    const horizontal_input = target.find(`input[name='horizontal_attachments']`)
+    const horizontal_attachments = target.find(`.post-horizontal > a`)
+    horizontal_attachments.nodes.forEach(_node => {
+        horizontal_array.push(`${_node.dataset.type}${_node.dataset.id}`)
+    })
+    horizontal_input.nodes[0].value = horizontal_array.join(',')
+
+    const vertical_array = []
+    const vertical_input = target.find(`input[name='vertical_attachments']`)
+    const vertical_attachments = target.find(`.post-vertical > .vertical-attachment`)
+    vertical_attachments.nodes.forEach(_node => {
+        vertical_array.push(`${_node.dataset.type}${_node.dataset.id}`)
+    })
+    vertical_input.nodes[0].value = vertical_array.join(',')
+}