diff --git a/app/imports/ui/library/LibraryNodeCreationDialog.vue b/app/imports/ui/library/LibraryNodeCreationDialog.vue
index 9fcc52f3..6e18918a 100644
--- a/app/imports/ui/library/LibraryNodeCreationDialog.vue
+++ b/app/imports/ui/library/LibraryNodeCreationDialog.vue
@@ -2,14 +2,14 @@
 	<transition-group name="slide">
 		<dialog-base v-show="step == 1" class="step-1" key="left">
 			<div slot="toolbar">Add Library Content</div>
-			<property-selector @select="setProperty"/>
+			<property-selector @select="setType"/>
 		</dialog-base>
 		<library-node-insert-form
 			v-show="step == 2"
 			class="step-2"
 			key="right"
-			:type="property && property.type"
-			:property-name="property && property.name"
+			:type="type"
+			:property-name="getPropertyName(type)"
 			@back="step = 1"
 		/>
 	</transition-group>
@@ -19,10 +19,11 @@
 import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 import PropertySelector from '/imports/ui/properties/PropertySelector.vue';
 import LibraryNodeInsertForm from '/imports/ui/library/LibraryNodeInsertForm.vue';
+import { getPropertyName } from '/imports/constants/PROPERTIES.js';
 
 export default {
   data() { return {
-    property: undefined,
+    type: undefined,
 		step: 1,
   };},
   components: {
@@ -31,10 +32,11 @@ export default {
 		LibraryNodeInsertForm,
   },
 	methods: {
-		setProperty(property){
-			this.property = property;
+		setType(property){
+			this.type = property;
 			this.step = 2;
-		}
+		},
+		getPropertyName,
 	},
 };
 </script>
diff --git a/app/imports/ui/properties/PropertySelector.vue b/app/imports/ui/properties/PropertySelector.vue
index b515976f..dad2993c 100644
--- a/app/imports/ui/properties/PropertySelector.vue
+++ b/app/imports/ui/properties/PropertySelector.vue
@@ -2,7 +2,7 @@
 	<div>
 		<v-container fluid grid-list-lg fill-height>
 			<v-layout row wrap>
-				<v-flex v-for="(type, property) in PROPERTIES" :key="type" xs4>
+				<v-flex v-for="(property, type) in PROPERTIES" :key="type" xs4>
 					<v-card hover @click="$emit('select', type)">
 						<div class="layout row align-center justify-center" style="min-height: 70px;">
 							<v-icon x-large>{{property.icon}}</v-icon>