diff --git a/src/renderer/components/+user-management/+cluster-roles/add-dialog.tsx b/src/renderer/components/+user-management/+cluster-roles/add-dialog.tsx
index 91ae6dabdd..a238dd942e 100644
--- a/src/renderer/components/+user-management/+cluster-roles/add-dialog.tsx
+++ b/src/renderer/components/+user-management/+cluster-roles/add-dialog.tsx
@@ -42,11 +42,11 @@ export class AddClusterRoleDialog extends React.Component<Props> {
   @observable clusterRoleName = "";
 
   static open() {
-    this.isOpen.set(true);
+    AddClusterRoleDialog.isOpen.set(true);
   }
 
   static close() {
-    this.isOpen.set(false);
+    AddClusterRoleDialog.isOpen.set(false);
   }
 
   reset = () => {
diff --git a/src/renderer/components/+user-management/+roles/add-dialog.tsx b/src/renderer/components/+user-management/+roles/add-dialog.tsx
index e7752e4f49..361c14dc61 100644
--- a/src/renderer/components/+user-management/+roles/add-dialog.tsx
+++ b/src/renderer/components/+user-management/+roles/add-dialog.tsx
@@ -50,17 +50,13 @@ export class AddRoleDialog extends React.Component<Props> {
   }
 
   static open() {
-    this.isOpen.set(true);
+    AddRoleDialog.isOpen.set(true);
   }
 
   static close() {
-    this.isOpen.set(false);
+    AddRoleDialog.isOpen.set(false);
   }
 
-  close = () => {
-    AddRoleDialog.close();
-  };
-
   reset = () => {
     this.roleName = "";
     this.namespace = "";
@@ -72,7 +68,7 @@ export class AddRoleDialog extends React.Component<Props> {
 
       showDetails(role.selfLink);
       this.reset();
-      this.close();
+      AddRoleDialog.close();
     } catch (err) {
       Notifications.error(err.toString());
     }
@@ -87,9 +83,9 @@ export class AddRoleDialog extends React.Component<Props> {
         {...dialogProps}
         className="AddRoleDialog"
         isOpen={AddRoleDialog.isOpen.get()}
-        close={this.close}
+        close={AddRoleDialog.close}
       >
-        <Wizard header={header} done={this.close}>
+        <Wizard header={header} done={AddRoleDialog.close}>
           <WizardStep
             contentClass="flex gaps column"
             nextLabel="Create"
diff --git a/src/renderer/components/+user-management/+service-accounts/create-dialog.tsx b/src/renderer/components/+user-management/+service-accounts/create-dialog.tsx
index d96a5d8b3f..e812068506 100644
--- a/src/renderer/components/+user-management/+service-accounts/create-dialog.tsx
+++ b/src/renderer/components/+user-management/+service-accounts/create-dialog.tsx
@@ -51,17 +51,13 @@ export class CreateServiceAccountDialog extends React.Component<Props> {
   }
 
   static open() {
-    this.isOpen.set(true);
+    CreateServiceAccountDialog.isOpen.set(true);
   }
 
   static close() {
-    this.isOpen.set(false);
+    CreateServiceAccountDialog.isOpen.set(false);
   }
 
-  close = () => {
-    CreateServiceAccountDialog.close();
-  };
-
   createAccount = async () => {
     const { name, namespace } = this;
 
@@ -70,7 +66,7 @@ export class CreateServiceAccountDialog extends React.Component<Props> {
 
       this.name = "";
       showDetails(serviceAccount.selfLink);
-      this.close();
+      CreateServiceAccountDialog.close();
     } catch (err) {
       Notifications.error(err);
     }
@@ -86,9 +82,9 @@ export class CreateServiceAccountDialog extends React.Component<Props> {
         {...dialogProps}
         className="CreateServiceAccountDialog"
         isOpen={CreateServiceAccountDialog.isOpen.get()}
-        close={this.close}
+        close={CreateServiceAccountDialog.close}
       >
-        <Wizard header={header} done={this.close}>
+        <Wizard header={header} done={CreateServiceAccountDialog.close}>
           <WizardStep nextLabel="Create" next={this.createAccount}>
             <SubTitle title="Account Name" />
             <Input