diff --git a/app/imports/ui/components/ToolbarCard.vue b/app/imports/ui/components/ToolbarCard.vue
index 69f3cda4..8497d32b 100644
--- a/app/imports/ui/components/ToolbarCard.vue
+++ b/app/imports/ui/components/ToolbarCard.vue
@@ -2,9 +2,10 @@
   <v-card :hover="hasClickListener" @click="$emit('click')">
   	<v-toolbar
 			flat
-			style="transform: none;"
+			:style="`transform: none; ${hasToolbarClickListener ? 'cursor: pointer;' : ''}`"
 			:color="color"
 			:dark="isDark"
+			@click="$emit('toolbarclick')"
 		>
   		<slot name="toolbar"/>
   	</v-toolbar>
@@ -31,7 +32,10 @@
 				return isDarkColor(this.color);
 			},
 			hasClickListener(){
-	    	return this.$listeners && !!this.$listeners.click
+	    	return this.$listeners && !!this.$listeners.click;
+			},
+			hasToolbarClickListener(){
+	    	return this.$listeners && !!this.$listeners.toolbarclick;
 			},
 		}
 	};
diff --git a/app/imports/ui/properties/components/inventory/ContainerCard.vue b/app/imports/ui/properties/components/inventory/ContainerCard.vue
index 2d7a4519..1cb6994f 100644
--- a/app/imports/ui/properties/components/inventory/ContainerCard.vue
+++ b/app/imports/ui/properties/components/inventory/ContainerCard.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-	<toolbar-card :color="model.color" @click="clickProperty(model._id)" :data-id="model._id">
+	<toolbar-card :color="model.color" @toolbarclick="clickProperty(model._id)" :data-id="model._id">
 		<template slot="toolbar">
 			<span>
 				{{model.name}}
diff --git a/app/imports/ui/properties/components/inventory/ItemListTile.vue b/app/imports/ui/properties/components/inventory/ItemListTile.vue
index 5803e30b..2f52bf8c 100644
--- a/app/imports/ui/properties/components/inventory/ItemListTile.vue
+++ b/app/imports/ui/properties/components/inventory/ItemListTile.vue
@@ -1,5 +1,5 @@
 <template lang="html">
-	<v-list-tile class="skill-list-tile" height="32px" v-on="hasClickListener ? {click} : {}">
+	<v-list-tile class="skill-list-tile" height="32px" v-on="hasClickListener ? {click: () => $emit('click')} : {}">
 		<v-list-tile-content>
 			<v-list-tile-title>
 				{{model.name}}
@@ -13,6 +13,11 @@ export default {
 	props: {
 		model: Object,
 	},
+	computed: {
+		hasClickListener(){
+			return this.$listeners && !!this.$listeners.click
+		},
+	}
 }
 </script>