diff --git a/src/components/views/elements/AccessibleButton.js b/src/components/views/elements/AccessibleButton.js
index 06c440c54e..a43e2ff26a 100644
--- a/src/components/views/elements/AccessibleButton.js
+++ b/src/components/views/elements/AccessibleButton.js
@@ -69,8 +69,7 @@ export default function AccessibleButton(props) {
 
     restProps.tabIndex = restProps.tabIndex || "0";
     restProps.role = "button";
-    restProps.className = (restProps.className ? restProps.className + " " : "") +
-                          "mx_AccessibleButton";
+    restProps.className = (restProps.className ? restProps.className + " " : "") + "mx_AccessibleButton";
 
     if (kind) {
         // We apply a hasKind class to maintain backwards compatibility with
@@ -80,6 +79,7 @@ export default function AccessibleButton(props) {
 
     if (disabled) {
         restProps.className += " mx_AccessibleButton_disabled";
+        restProps["aria-disabled"] = true;
     }
 
     return React.createElement(element, restProps, children);
diff --git a/src/components/views/elements/ToggleSwitch.js b/src/components/views/elements/ToggleSwitch.js
index 0d8b3d042f..b3f6390b8e 100644
--- a/src/components/views/elements/ToggleSwitch.js
+++ b/src/components/views/elements/ToggleSwitch.js
@@ -64,7 +64,12 @@ export default class ToggleSwitch extends React.Component {
             "mx_ToggleSwitch_enabled": !this.props.disabled,
         });
         return (
-            <div className={classes} onClick={this._onClick}>
+            <div
+                className={classes}
+                onClick={this._onClick}
+                role="checkbox"
+                aria-checked={this.state.checked}
+                aria-disabled={this.props.disabled}>
                 <div className="mx_ToggleSwitch_ball" />
             </div>
         );