diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index b8017d3f8..8bd2db31a 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -1190,3 +1190,8 @@ nav.nav {
     background-color: transparent;
   }
 }
+
+.button-not-clickable {
+  cursor: default;
+  pointer-events: none;
+}
diff --git a/app/templates/views/organizations/organization/index.html b/app/templates/views/organizations/organization/index.html
index 94fbe541d..026588ced 100644
--- a/app/templates/views/organizations/organization/index.html
+++ b/app/templates/views/organizations/organization/index.html
@@ -59,10 +59,12 @@
   </div>
 
   <div class="display-flex flex-gap-1 margin-bottom-3">
-    <a href="{{ url_for('.organization_dashboard', org_id=current_org.id, action='create-service') }}" class="usa-button {% if not show_create_service %}usa-button--outline{% endif %}">
+    <a {% if not show_create_service %}href="{{ url_for('.organization_dashboard', org_id=current_org.id, action='create-service') }}"{% endif %}
+       class="usa-button {% if show_create_service %}usa-button--base button-not-clickable{% else %}usa-button--outline{% endif %}">
       Create new service
     </a>
-    <a href="{{ url_for('.organization_dashboard', org_id=current_org.id, action='invite-user') }}" class="usa-button {% if not show_invite_user %}usa-button--outline{% endif %}">
+    <a {% if not show_invite_user %}href="{{ url_for('.organization_dashboard', org_id=current_org.id, action='invite-user') }}"{% endif %}
+       class="usa-button {% if show_invite_user %}usa-button--base button-not-clickable{% else %}usa-button--outline{% endif %}">
       Add org admin
     </a>
   </div>
@@ -78,7 +80,7 @@
 
         <div class="display-flex flex-gap-1 margin-top-3">
           <button type="submit" class="usa-button">Create service</button>
-          <a href="{{ url_for('.organization_dashboard', org_id=current_org.id) }}" class="usa-button usa-button--unstyled">Cancel</a>
+          <a href="{{ url_for('.organization_dashboard', org_id=current_org.id) }}" class="usa-button usa-button--outline">Cancel</a>
         </div>
       </form>
     </div>
@@ -96,7 +98,7 @@
 
         <div class="display-flex flex-gap-1 margin-top-3">
           <button type="submit" class="usa-button">Send invitation</button>
-          <a href="{{ url_for('.organization_dashboard', org_id=current_org.id) }}" class="usa-button usa-button--unstyled">Cancel</a>
+          <a href="{{ url_for('.organization_dashboard', org_id=current_org.id) }}" class="usa-button usa-button--outline">Cancel</a>
         </div>
       </form>
     </div>