diff --git a/source/nodejs/adaptivecards-designer/src/toolbar.ts b/source/nodejs/adaptivecards-designer/src/toolbar.ts
index 05e1f99d9c..676cb8f253 100644
--- a/source/nodejs/adaptivecards-designer/src/toolbar.ts
+++ b/source/nodejs/adaptivecards-designer/src/toolbar.ts
@@ -72,10 +72,12 @@ export class ToolbarButton extends ToolbarElement {
         if(!this.isEnabled) {
             this.renderedElement.classList.add("acd-toolbar-button-disabled");
             this.renderedElement.setAttribute("aria-disabled", "true");
+            this.renderedElement.tabIndex = -1;
         }
         else {
             this.renderedElement.classList.remove("acd-toolbar-button-disabled");
             this.renderedElement.removeAttribute("aria-disabled");
+            this.renderedElement.tabIndex = 0;
         }
 
         if (this.isToggled) {