diff --git a/frontend_tests/node_tests/upload.js b/frontend_tests/node_tests/upload.js
index 3d6e41a5f3..f3a748265c 100644
--- a/frontend_tests/node_tests/upload.js
+++ b/frontend_tests/node_tests/upload.js
@@ -105,7 +105,7 @@ test("get_item", () => {
     assert.equal(upload.get_item("source", {mode: "edit", row: 123}), "message-edit-file-input");
     assert.equal(
         upload.get_item("drag_drop_container", {mode: "edit", row: 1}),
-        $(".message_edit_form"),
+        $(`#zfilt${CSS.escape(1)} .message_edit_form`),
     );
     assert.equal(
         upload.get_item("markdown_preview_hide_button", {mode: "edit", row: 65}),
diff --git a/static/js/upload.js b/static/js/upload.js
index fe6155bf99..50f5dd9dfc 100644
--- a/static/js/upload.js
+++ b/static/js/upload.js
@@ -77,7 +77,7 @@ export function get_item(key, config) {
             case "source":
                 return "message-edit-file-input";
             case "drag_drop_container":
-                return $(".message_edit_form");
+                return $(`#zfilt${CSS.escape(config.row)} .message_edit_form`);
             case "markdown_preview_hide_button":
                 return $(`#edit_form_${CSS.escape(config.row)} .undo_markdown_preview`);
             default: