diff --git a/src/components/ViewSpecRegistrationModal.vue b/src/components/ViewSpecRegistrationModal.vue
index b102c560..7a51162c 100644
--- a/src/components/ViewSpecRegistrationModal.vue
+++ b/src/components/ViewSpecRegistrationModal.vue
@@ -25,6 +25,7 @@
           class="alert-message"
         />
         <KTable
+          class="applications-list"
           :is-loading="currentState.matches('pending')"
           data-testid="applications-list"
           :fetcher-cache-key="fetcherCacheKey"
@@ -369,7 +370,7 @@ export default defineComponent({
 
     watch(() => selectedApplication.value, (newSelectedApplication, oldSelectedApplication) => {
       // We reset selectedScopes if we change applications
-      if (newSelectedApplication !== oldSelectedApplication && selectedScopes.value.length) {
+      if (newSelectedApplication !== oldSelectedApplication && selectedScopes.value?.length) {
         selectedScopes.value = []
       }
     })
@@ -395,7 +396,9 @@ export default defineComponent({
           })
         }
 
-        if (selectedApplication.value) {
+        // don't fetch the applications granted scopes if there are no available
+        // scopes.
+        if (selectedApplication.value && availableScopes.value?.length) {
           fetchingScopes.value = true
 
           await portalApiV2.value.service.applicationsApi.getApplicationProductVersionGrantedScopes({
@@ -455,12 +458,11 @@ export default defineComponent({
 
  .table-text {
   text-align: left;
-  font-weight: 600;
  }
 
  .application-registration-modal {
   :deep(.selected) {
-    .k-input-label {
+    td {
       font-weight: 600;
       width: 100%;
     }
diff --git a/src/views/Applications/ApplicationForm.vue b/src/views/Applications/ApplicationForm.vue
index ddfb5307..2fa8a880 100644
--- a/src/views/Applications/ApplicationForm.vue
+++ b/src/views/Applications/ApplicationForm.vue
@@ -355,7 +355,7 @@ export default defineComponent({
               value: strat.id,
               isDcr: strat.credential_type === 'client_credentials',
               isSelfManaged: strat.credential_type === 'self_managed_client_credentials',
-              selected: formData.value.auth_strategy_id ? strat.id === formData.value.auth_strategy_id : ($route.query.auth_strategy_id || false)
+              selected: formData.value.auth_strategy_id ? strat.id === formData.value.auth_strategy_id : (strat.id === $route.query.auth_strategy_id || false)
             }))
           }