diff --git a/services/web/public/coffee/ide/review-panel/directives/reviewPanelToggle.coffee b/services/web/public/coffee/ide/review-panel/directives/reviewPanelToggle.coffee
index 24b7070d07..2b5180dce6 100644
--- a/services/web/public/coffee/ide/review-panel/directives/reviewPanelToggle.coffee
+++ b/services/web/public/coffee/ide/review-panel/directives/reviewPanelToggle.coffee
@@ -6,16 +6,23 @@ define [
 		scope: 
 			onToggle: '='
 			ngModel: '='
+			disabled: '=?'
+			onDisabledClick: '=?'
 		link: (scope) ->
+			if !scope.disabled?
+				scope.disabled = false
 			scope.onChange = (args...) ->
 				scope.onToggle(scope.localModel)
+			scope.handleClick = () ->
+				if scope.disabled
+					scope.onDisabledClick()
 			scope.localModel = scope.ngModel
 			scope.$watch "ngModel", (value) ->
 				scope.localModel = value
 
 		template: """
-<div class="rp-toggle">
-	<input id="rp-toggle-{{$id}}" type="checkbox" class="rp-toggle-hidden-input" ng-model="localModel" ng-change="onChange()" />
+<div class="rp-toggle" ng-click="handleClick();">
+	<input id="rp-toggle-{{$id}}" ng-disabled="disabled" type="checkbox" class="rp-toggle-hidden-input" ng-model="localModel" ng-change="onChange()" />
 	<label for="rp-toggle-{{$id}}" class="rp-toggle-btn"></label>
 </div>
 """
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index da9fa7eb43..419a154853 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -643,7 +643,7 @@
 .rp-toggle {
 	display: inline-block;
 	vertical-align: middle;
-	margin-left: 5px;
+	padding-left: 5px;
 }
 	.rp-toggle-hidden-input {
 		display: none;