diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
index f21f7b8d3d..26583b108b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblistviewsettings.directive.js
@@ -1,9 +1,9 @@
 (function() {
   'use strict';
 
-  function ListViewSettingsDirective(contentTypeResource, dataTypeResource, dataTypeHelper, listViewPrevalueHelper) {
+  function ListViewSettingsDirective(dataTypeResource, dataTypeHelper, listViewPrevalueHelper) {
 
-    function link(scope, el, attr, ctrl) {
+    function link(scope) {
 
       scope.dataType = {};
       scope.editDataTypeSettings = false;
@@ -22,7 +22,6 @@
 
               listViewPrevalueHelper.setPrevalues(dataType.preValues);
               scope.customListViewCreated = checkForCustomListView();
-
             });
 
         } else {
@@ -111,8 +110,16 @@
 
       };
 
+     scope.toggle = function(){
+        if(scope.enableListView){
+          scope.enableListView = false;
+            return;
+        }
+        scope.enableListView = true;
+    };
+
       /* ----------- SCOPE WATCHERS ----------- */
-      var unbindEnableListViewWatcher = scope.$watch('enableListView', function(newValue, oldValue){
+      var unbindEnableListViewWatcher = scope.$watch('enableListView', function(newValue){
 
         if(newValue !== undefined) {
           activate();
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
index 5afd3012eb..356864546a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-list-view-settings.html
@@ -1,9 +1,11 @@
 <div class="umb-list-view-settings">
 
   <div class="umb-list-view-settings__trigger">
-    <label class="checkbox no-indent">
-        <input type="checkbox" ng-model="enableListView" hotkey="alt+shift+l" />
-        <localize key="general_yes"></localize> - <localize key="contentTypeEditor_enableListViewHeading"></localize>
+        <umb-toggle
+            checked="enableListView"
+            on-click="toggle()"
+            hotkey="alt+shift+l">
+        </umb-toggle>
   </div>
 
   <!-- list view enabled -->