diff --git a/operators/shape.py b/operators/shape.py
index b86e3dd..a8861ce 100644
--- a/operators/shape.py
+++ b/operators/shape.py
@@ -48,11 +48,10 @@ class RP_OT_create_shape(Operator):
 
             mesh.from_pydata(verts, edges, faces)
 
-            for col in bpy.data.collections:
-                if col.rig_picker.link_shape:
-                    col.objects.link(ob)
-            else:
-                scn.collection.objects.link(ob)
+            picker_selected_cols = [col for col in bpy.data.collections if col.rig_picker.link_shape]
+
+            for col in picker_selected_cols or [scn.collection]:
+                col.objects.link(ob)
 
             ob.location.z = 0.05
             ob.location.x = offset