diff --git a/dist/index.js b/dist/index.js
index 7e45987d..d52cd237 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2085,7 +2085,7 @@
       [appliedFilter, resultCount],
       () => translation.searchTitleText(appliedFilter.value, resultCount.value)
     );
-    const messageObjects = new MapState();
+    const showingMessageObjects = new MapState();
     const cannotReset = createProxyState(
       [appliedFilter],
       () => appliedFilter.value == ""
@@ -2096,20 +2096,27 @@
     }
     function applyFilter() {
       appliedFilter.value = filterInput.value;
-    }
-    function updateObjects() {
       const allObjects = [...chat.objects.value.entries()];
       const matchingObjects = allObjects.filter((entry) => {
-        let objectTitle = entry[1].title || translation.untitledObject;
-        const regex = new RegExp(appliedFilter.value.toLowerCase());
-        return regex.test(objectTitle.toLowerCase());
+        return checkMatchesFilter(entry[1]);
       });
       resultCount.value = matchingObjects.length;
-      messageObjects.clear();
-      matchingObjects.forEach((entry) => messageObjects.set(...entry));
+      showingMessageObjects.clear();
+      matchingObjects.forEach((entry) => showingMessageObjects.set(...entry));
     }
-    bulkSubscribe([appliedFilter, chat.objects], updateObjects);
-    updateObjects();
+    chat.objects.handleAddition((messageObject) => {
+      if (checkMatchesFilter(messageObject) == false) return;
+      showingMessageObjects.set(messageObject.id, messageObject);
+      chat.objects.handleRemoval(messageObject, () => {
+        showingMessageObjects.remove(messageObject.id);
+      });
+    });
+    function checkMatchesFilter(messageObject) {
+      let objectTitle = messageObject.title || translation.untitledObject;
+      const regex = new RegExp(appliedFilter.value.toLowerCase());
+      return regex.test(objectTitle.toLowerCase());
+    }
+    applyFilter();
     const objectModal = createProxyState(
       [chat.objects, selectedObject],
       () => {
@@ -2136,7 +2143,7 @@
       }
       return getViewFunction()(
         chat,
-        messageObjects,
+        showingMessageObjects,
         selectedObject,
         isShowingObjectModal
       );
@@ -2165,7 +2172,7 @@
         class: "object-content width-100 height-100 flex scroll-no",
         "children:set": mainView
       }
-    ), /* @__PURE__ */ createElement("div", { class: "modal", "toggle:open": isShowingFilterModel }, /* @__PURE__ */ createElement("div", { style: "max-width: unset; width: 100%" }, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translation.filterObjects), /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "search"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.searchByTitle), /* @__PURE__ */ createElement(
+    ), /* @__PURE__ */ createElement("div", { class: "modal", "toggle:open": isShowingFilterModel }, /* @__PURE__ */ createElement("div", { style: "max-width: 2084px" }, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translation.filterObjects), /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "search"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.searchByTitle), /* @__PURE__ */ createElement(
       "input",
       {
         "bind:value": filterInput,
@@ -2182,7 +2189,7 @@
       translation.reset
     ), /* @__PURE__ */ createElement("button", { class: "width-50 flex primary", "on:click": applyFilter }, translation.search, /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward"))), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("span", { class: "secondary", "subscribe:innerText": resultText }), ObjectGridView(
       chat,
-      messageObjects,
+      showingMessageObjects,
       selectedObject,
       isShowingObjectModal
     )), /* @__PURE__ */ createElement("button", { "on:click": closeFilters }, translation.close, /* @__PURE__ */ createElement("span", { class: "icon" }, "close")))), /* @__PURE__ */ createElement("div", { "children:set": objectModal }));
diff --git a/dist/styles.css b/dist/styles.css
index e662a646..b9d9aa2c 100644
--- a/dist/styles.css
+++ b/dist/styles.css
@@ -787,6 +787,10 @@ header button {
   max-height: 100% !important;
 }
 
+.modal > div > :is(button, div.flex-row) {
+  min-height: var(--control-height);
+}
+
 .ellipsis {
   max-width: 100%;
 }
diff --git a/src/Views/Objects/objectPane.tsx b/src/Views/Objects/objectPane.tsx
index 0c270668..31c4ad90 100644
--- a/src/Views/Objects/objectPane.tsx
+++ b/src/Views/Objects/objectPane.tsx
@@ -48,7 +48,7 @@ export function ObjectPane(chat: Chat) {
   const resultText = React.createProxyState([appliedFilter, resultCount], () =>
     translation.searchTitleText(appliedFilter.value, resultCount.value)
   );
-  const messageObjects = new React.MapState<MessageObject>();
+  const showingMessageObjects = new React.MapState<MessageObject>();
   const cannotReset = React.createProxyState(
     [appliedFilter],
     () => appliedFilter.value == ""
@@ -60,21 +60,31 @@ export function ObjectPane(chat: Chat) {
   }
   function applyFilter() {
     appliedFilter.value = filterInput.value;
-  }
 
-  function updateObjects() {
     const allObjects = [...chat.objects.value.entries()];
     const matchingObjects = allObjects.filter((entry) => {
-      let objectTitle = entry[1].title || translation.untitledObject;
-      const regex = new RegExp(appliedFilter.value.toLowerCase());
-      return regex.test(objectTitle.toLowerCase());
+      return checkMatchesFilter(entry[1]);
     });
     resultCount.value = matchingObjects.length;
-    messageObjects.clear();
-    matchingObjects.forEach((entry) => messageObjects.set(...entry));
+    showingMessageObjects.clear();
+    matchingObjects.forEach((entry) => showingMessageObjects.set(...entry));
   }
-  React.bulkSubscribe([appliedFilter, chat.objects], updateObjects);
-  updateObjects();
+
+  chat.objects.handleAddition(messageObject => {
+    if (checkMatchesFilter(messageObject) == false) return;
+    showingMessageObjects.set(messageObject.id, messageObject);
+    chat.objects.handleRemoval(messageObject, () => {
+      showingMessageObjects.remove(messageObject.id);
+    })
+  })
+
+  function checkMatchesFilter(messageObject: MessageObject) {
+    let objectTitle = messageObject.title || translation.untitledObject;
+    const regex = new RegExp(appliedFilter.value.toLowerCase());
+    return regex.test(objectTitle.toLowerCase());
+  }
+
+  applyFilter();
 
   // view
   const objectModal = React.createProxyState(
@@ -106,7 +116,7 @@ export function ObjectPane(chat: Chat) {
 
     return getViewFunction()(
       chat,
-      messageObjects,
+      showingMessageObjects,
       selectedObject,
       isShowingObjectModal
     );
@@ -144,7 +154,7 @@ export function ObjectPane(chat: Chat) {
       ></div>
 
       <div class="modal" toggle:open={isShowingFilterModel}>
-        <div style="max-width: unset; width: 100%">
+        <div style="max-width: 2084px">
           <main>
             <h2>{translation.filterObjects}</h2>
 
@@ -181,7 +191,7 @@ export function ObjectPane(chat: Chat) {
 
             {ObjectGridView(
               chat,
-              messageObjects,
+              showingMessageObjects,
               selectedObject,
               isShowingObjectModal
             )}
diff --git a/src/index.tsx b/src/index.tsx
index e7f30c4f..eedbf3cf 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -7,4 +7,4 @@ import { SettingsModal } from "./Views/settingsModal";
 document
   .querySelector("main")!
   .append(OverviewTab(), MessageTab(), SettingsModal());
-document.querySelector("main")!.classList.add("split");
+document.querySelector("main")!.classList.add("split");
\ No newline at end of file