diff --git a/public/javascripts/spacedeck_sections.js b/public/javascripts/spacedeck_sections.js
index 3ca372a..4537434 100644
--- a/public/javascripts/spacedeck_sections.js
+++ b/public/javascripts/spacedeck_sections.js
@@ -182,7 +182,8 @@ var SpacedeckSections = {
     toolbar_props_in: false,
     toolbar_artifacts_x: "-1000px",
     toolbar_artifacts_y: "-1000px",
-    toolbar_artifacts_in: true
+    toolbar_artifacts_in: true,
+    toolbar_lock_in: false
   },
 
   methods: {
@@ -848,7 +849,7 @@ var SpacedeckSections = {
       if (!a) return false;
       if (!this.active_space) return false;
 
-      if (this.active_space_role=="viewer" || (a.locked && this.active_space_role!="admin")) {
+      if (this.active_space_role=="viewer" || (a.locked && this.active_space_role=="viewer")) {
         return false;
       }
 
@@ -2526,11 +2527,18 @@ var SpacedeckSections = {
     },
 
     show_toolbar_props: function() {
-      if (this.selection_metrics.count==0) return;
+      if (this.selection_metrics.count==0) {
+        this.toolbar_lock_in = false;
+        return;
+      }
       arts = this.selected_artifacts();
+      // check if selected artifacts are all from the same user
+      let same_user = true;
       for (var i=0;i<arts.length; i++) {
         if (arts[i].mime=="x-spacedeck/zone") return;
+        if (arts[i].user_id!==this.user._id) same_user = false;
       }
+      this.toolbar_lock_in = same_user;
       this.toolbar_props_in = true;
     },
 
diff --git a/views/partials/tool/object-options.html b/views/partials/tool/object-options.html
index 0b01b15..d74e04c 100644
--- a/views/partials/tool/object-options.html
+++ b/views/partials/tool/object-options.html
@@ -7,12 +7,12 @@
 
     <button class="btn btn-divider"></button>
 
-    <button class="btn btn-transparent btn-icon-labeled" v-on:click="lock_selected_artifacts()" v-if="active_space_role=='admin'" title="<%=__("lock")%>">
+    <button class="btn btn-transparent btn-icon-labeled" v-on:click="lock_selected_artifacts()" v-if="active_space_role=='admin' || toolbar_lock_in" title="<%=__("lock")%>">
       <span class="icon icon-lock-closed"></span>
       <span class="icon-label"><%=__("lock")%></span>
     </button>
 
-    <button class="btn btn-transparent btn-icon-labeled" v-on:click="unlock_selected_artifacts()" v-if="active_space_role=='admin'" title="<%=__("unlock")%>">
+    <button class="btn btn-transparent btn-icon-labeled" v-on:click="unlock_selected_artifacts()" v-if="active_space_role=='admin' || toolbar_lock_in" title="<%=__("unlock")%>">
       <span class="icon icon-lock-open"></span>
       <span class="icon-label"><%=__("unlock")%></span>
     </button>