diff --git a/src/components/views/elements/SettingsCheckbox.js b/src/components/views/elements/SettingsCheckbox.js
index f66dee73d0..a195bae691 100644
--- a/src/components/views/elements/SettingsCheckbox.js
+++ b/src/components/views/elements/SettingsCheckbox.js
@@ -69,12 +69,10 @@ module.exports = React.createClass({
         }
 
         return (
-            <div className="mx_SettingCheckbox">
+            <label>
                 { checkbox }
-                <label htmlFor={id}>
-                    { label }
-                </label>
-            </div>
+                { label }
+            </label>
         );
     },
 });