diff --git a/frontend/app/javascript/dashboard/routes/dashboard/captain/assistants/guardrails/Index.vue b/frontend/app/javascript/dashboard/routes/dashboard/captain/assistants/guardrails/Index.vue
index 86272be3..542686fd 100644
--- a/frontend/app/javascript/dashboard/routes/dashboard/captain/assistants/guardrails/Index.vue
+++ b/frontend/app/javascript/dashboard/routes/dashboard/captain/assistants/guardrails/Index.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useAlert } from 'dashboard/composables';
@@ -30,6 +30,14 @@ const assistant = computed(() =>
   store.getters['captainAssistants/getRecord'](assistantId.value)
 );
 
+// Fetch the assistant record if it's not already in the store
+// (e.g. when navigating directly to this page via URL)
+onMounted(() => {
+  if (!assistant.value?.id) {
+    store.dispatch('captainAssistants/show', assistantId.value);
+  }
+});
+
 const searchQuery = ref('');
 const newInlineRule = ref('');
 const newDialogRule = ref('');
diff --git a/frontend/app/javascript/dashboard/routes/dashboard/captain/assistants/guidelines/Index.vue b/frontend/app/javascript/dashboard/routes/dashboard/captain/assistants/guidelines/Index.vue
index 47bf2dc1..2875cd39 100644
--- a/frontend/app/javascript/dashboard/routes/dashboard/captain/assistants/guidelines/Index.vue
+++ b/frontend/app/javascript/dashboard/routes/dashboard/captain/assistants/guidelines/Index.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useAlert } from 'dashboard/composables';
@@ -30,6 +30,14 @@ const assistant = computed(() =>
   store.getters['captainAssistants/getRecord'](assistantId.value)
 );
 
+// Fetch the assistant record if it's not already in the store
+// (e.g. when navigating directly to this page via URL)
+onMounted(() => {
+  if (!assistant.value?.id) {
+    store.dispatch('captainAssistants/show', assistantId.value);
+  }
+});
+
 const searchQuery = ref('');
 const newInlineRule = ref('');
 const newDialogRule = ref('');
diff --git a/frontend/app/javascript/dashboard/store/storeFactoryHelper.js b/frontend/app/javascript/dashboard/store/storeFactoryHelper.js
index f87be165..686d3b15 100644
--- a/frontend/app/javascript/dashboard/store/storeFactoryHelper.js
+++ b/frontend/app/javascript/dashboard/store/storeFactoryHelper.js
@@ -56,7 +56,10 @@ export const updateRecord =
     commit(mutationTypes.SET_UI_FLAG, { updatingItem: true });
     try {
       const response = await API.update(id, updateObj);
-      commit(mutationTypes.EDIT, response.data);
+      // Use UPSERT instead of EDIT so that the record is added to the store
+      // even if it wasn't previously loaded (e.g. direct URL navigation to
+      // a sub-page like guardrails/guidelines without visiting the list page).
+      commit(mutationTypes.UPSERT, response.data);
       return response.data;
     } catch (error) {
       return throwErrorMessage(error);