diff --git a/app/imports/ui/properties/viewers/SlotViewer.vue b/app/imports/ui/properties/viewers/SlotViewer.vue
index 35ed032d..cb886705 100644
--- a/app/imports/ui/properties/viewers/SlotViewer.vue
+++ b/app/imports/ui/properties/viewers/SlotViewer.vue
@@ -11,7 +11,12 @@
     />
     <property-field
       name="Condition"
-      :value="'slotConditionResult' in model ? model.slotConditionResult : model.slotCondition"
+      :value="model.slotCondition"
+    />
+    <property-field
+      v-if="'slotConditionResult' in model"
+      name="Condition result"
+      :value="model.slotConditionResult"
     />
     <template v-if="model.tags.length">
       <div class="caption">
diff --git a/app/imports/ui/properties/viewers/ToggleViewer.vue b/app/imports/ui/properties/viewers/ToggleViewer.vue
new file mode 100644
index 00000000..317af155
--- /dev/null
+++ b/app/imports/ui/properties/viewers/ToggleViewer.vue
@@ -0,0 +1,31 @@
+<template lang="html">
+  <div class="toggle-viewer">
+    <property-name :value="model.name" />
+    <property-field
+      v-if="model.disabled || model.enabled"
+      name="Status"
+      :value="model.enabled ? 'Enabled' : 'Disabled'"
+    />
+    <template
+      v-else-if="model.condition"
+    >
+      <property-field
+        name="Condition"
+        :value="model.condition"
+      />
+      <property-field
+        v-if="'toggleResult' in model"
+        name="Result"
+        :value="model.toggleResult"
+      />
+    </template>
+  </div>
+</template>
+
+<script>
+	import propertyViewerMixin from '/imports/ui/properties/viewers/shared/propertyViewerMixin.js'
+
+	export default {
+		mixins: [propertyViewerMixin],
+	}
+</script>
diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
index 87f53b98..b7a5f138 100644
--- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
+++ b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js
@@ -21,6 +21,7 @@ import SlotViewer from '/imports/ui/properties/viewers/SlotViewer.vue';
 import SlotFillerViewer from '/imports/ui/properties/viewers/SlotFillerViewer.vue';
 import SpellListViewer from '/imports/ui/properties/viewers/SpellListViewer.vue';
 import SpellViewer from '/imports/ui/properties/viewers/SpellViewer.vue';
+import ToggleViewer from '/imports/ui/properties/viewers/ToggleViewer.vue';
 
 export default {
   action: ActionViewer,
@@ -46,4 +47,5 @@ export default {
   skill: SkillViewer,
   spellList: SpellListViewer,
   spell: SpellViewer,
+  toggle: ToggleViewer,
 };