diff --git a/package-lock.json b/package-lock.json
index 439437656..b32f9c29d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2762,9 +2762,9 @@
       }
     },
     "dayjs": {
-      "version": "1.8.32",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.32.tgz",
-      "integrity": "sha512-V91aTRu5btP+uzGHaaOfodckEfBWhmi9foRP7cauAO1PTB8+tZ9o0Jec7q6TIIRY1N4q1IfiKsZunkB/AEWqMQ=="
+      "version": "1.8.33",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.33.tgz",
+      "integrity": "sha512-881TDLZCdpJFKbraWRHcUG8zfMLLX400ENf9rFZDuWc5zYMss6xifo2PhlDX0ftOmR2NRmaIY47bAa4gKQfXqw=="
     },
     "debug": {
       "version": "4.1.1",
@@ -3065,9 +3065,9 @@
       }
     },
     "electron": {
-      "version": "10.0.0-beta.19",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0-beta.19.tgz",
-      "integrity": "sha512-UHpCyGfb+tkiJutNLNhH0qm2hELw8zY1g3+kpdH0OFPyMfzvJHQk6+mCz9VzWZNqGGnEpXryY5zQ0Ou/eoMH4A==",
+      "version": "10.0.0-beta.21",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0-beta.21.tgz",
+      "integrity": "sha512-r2qIQ9lzq2FBeEpitBWJ5WO0V+TtrEvrgAXc2sUCrZqKfS1kUoJadmrDy69j4R3qNfifRrxuR2wISMmvNL2SAQ==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
diff --git a/package.json b/package.json
index ec90017e3..ac5d74de2 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "commonmark": "0.29.1",
     "cookie-parser": "1.4.5",
     "csurf": "1.11.0",
-    "dayjs": "1.8.32",
+    "dayjs": "1.8.33",
     "debug": "4.1.1",
     "ejs": "3.1.3",
     "electron-debug": "3.1.0",
@@ -76,7 +76,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.2",
-    "electron": "10.0.0-beta.19",
+    "electron": "10.0.0-beta.21",
     "electron-builder": "22.8.0",
     "electron-packager": "15.0.0",
     "electron-rebuild": "1.11.0",
diff --git a/src/public/app/services/attribute_autocomplete.js b/src/public/app/services/attribute_autocomplete.js
index 2f3257705..544239e8f 100644
--- a/src/public/app/services/attribute_autocomplete.js
+++ b/src/public/app/services/attribute_autocomplete.js
@@ -26,6 +26,12 @@ function initAttributeNameAutocomplete({ $el, attributeType, open }) {
                 cb(result);
             }
         }]);
+
+        $el.on('autocomplete:opened', () => {
+            if ($el.attr("readonly")) {
+                $el.autocomplete('close');
+            }
+        });
     }
 
     if (open) {
@@ -64,6 +70,12 @@ async function initLabelValueAutocomplete({ $el, open, nameCallback }) {
                 cb(filtered);
             }
         }]);
+
+        $el.on('autocomplete:opened', () => {
+            if ($el.attr("readonly")) {
+                $el.autocomplete('close');
+            }
+        })
     }
 
     if (open) {
diff --git a/src/public/app/services/note_autocomplete.js b/src/public/app/services/note_autocomplete.js
index 5a9a74fe9..baa12c604 100644
--- a/src/public/app/services/note_autocomplete.js
+++ b/src/public/app/services/note_autocomplete.js
@@ -102,6 +102,12 @@ function initNoteAutocomplete($el, options) {
         }
     });
 
+    $el.on('autocomplete:opened', () => {
+        if ($el.attr("readonly")) {
+            $el.autocomplete('close');
+        }
+    });
+
     return $el;
 }
 
diff --git a/src/public/app/widgets/attribute_detail.js b/src/public/app/widgets/attribute_detail.js
index 6ca25f6e1..89a0bfbb1 100644
--- a/src/public/app/widgets/attribute_detail.js
+++ b/src/public/app/widgets/attribute_detail.js
@@ -295,12 +295,15 @@ export default class AttributeDetailWidget extends BasicWidget {
             }
         }
 
+        this.$saveAndCloseButton.toggle(!!isOwned);
+
         if (isOwned) {
             this.$attrIsOwnedBy.hide();
         }
         else {
             this.$attrIsOwnedBy
                 .show()
+                .empty()
                 .append(attribute.type === 'label' ? 'Label' : 'Relation')
                 .append(' is owned by note ')
                 .append(await linkService.createNoteLink(attribute.noteId))
diff --git a/src/public/app/widgets/attribute_list.js b/src/public/app/widgets/attribute_list.js
index 5ce43a30f..bb5d4c3a9 100644
--- a/src/public/app/widgets/attribute_list.js
+++ b/src/public/app/widgets/attribute_list.js
@@ -13,7 +13,7 @@ const TPL = `
             margin-right: 7px;
         }
         
-        .inherited-attributes {
+        .inherited-attributes-wrapper {
             color: var(--muted-text-color);
             max-height: 200px;
             overflow: auto;