diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index f5596203164a..a6e5038edc44 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -179,6 +179,12 @@
         <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
       </span>
       <span v-else-if="$route.name === 'guestoshypervisormapping'">
+        <QuickView
+          style="margin-left: 5px"
+          :actions="actions"
+          :resource="record"
+          :enabled="quickViewEnabled() && actions.length > 0 && columns && columns[0].dataIndex === 'hypervisor' "
+          @exec-action="$parent.execAction"/>
         <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
       </span>
       <span v-else>{{ text }}</span>
@@ -532,7 +538,7 @@ export default {
         '/template', '/iso',
         '/project', '/account',
         '/zone', '/pod', '/cluster', '/host', '/storagepool', '/imagestore', '/systemvm', '/router', '/ilbvm', '/annotation',
-        '/computeoffering', '/systemoffering', '/diskoffering', '/backupoffering', '/networkoffering', '/vpcoffering'].join('|'))
+        '/computeoffering', '/systemoffering', '/diskoffering', '/backupoffering', '/networkoffering', '/vpcoffering', '/guestos', '/guestoshypervisormapping'].join('|'))
         .test(this.$route.path)
     },
     enableGroupAction () {
diff --git a/ui/src/config/section/config.js b/ui/src/config/section/config.js
index fdc61c50e291..60a8be719c2c 100644
--- a/ui/src/config/section/config.js
+++ b/ui/src/config/section/config.js
@@ -86,7 +86,7 @@ export default {
     {
       name: 'guestos',
       title: 'label.guest.os',
-      docHelp: 'adminguide/service_offerings.html#compute-and-disk-service-offerings',
+      docHelp: 'adminguide/guest_os.html#guest-os',
       icon: 'laptop-outlined',
       permission: ['listOsTypes', 'listOsCategories'],
       columns: ['name', 'oscategoryname', 'isuserdefined'],
@@ -117,6 +117,7 @@ export default {
           icon: 'edit-outlined',
           label: 'label.edit',
           dataView: true,
+          popup: true,
           args: ['osdisplayname']
         },
         {
@@ -124,11 +125,11 @@ export default {
           icon: 'link-outlined',
           label: 'label.add.guest.os.hypervisor.mapping',
           dataView: true,
+          popup: true,
           args: ['ostypeid', 'hypervisor', 'hypervisorversion', 'osnameforhypervisor', 'osmappingcheckenabled', 'forced'],
           mapping: {
             ostypeid: {
-              api: 'listOsTypes',
-              params: (record) => { return { ostypeid: record.id } }
+              value: (record) => { return record.id }
             }
           }
         },
@@ -137,7 +138,6 @@ export default {
           icon: 'delete-outlined',
           label: 'label.action.delete.guest.os',
           message: 'message.action.delete.guest.os',
-          docHelp: 'adminguide/service_offerings.html#modifying-or-deleting-a-service-offering',
           dataView: true,
           popup: true
         }
@@ -146,7 +146,7 @@ export default {
     {
       name: 'guestoshypervisormapping',
       title: 'label.guest.os.hypervisor.mappings',
-      docHelp: 'adminguide/service_offerings.html#compute-and-disk-service-offerings',
+      docHelp: 'adminguide/guest_os.html#guest-os-hypervisor-mapping',
       icon: 'api-outlined',
       permission: ['listGuestOsMapping'],
       columns: ['hypervisor', 'hypervisorversion', 'osdisplayname', 'osnameforhypervisor'],
@@ -167,6 +167,7 @@ export default {
           icon: 'edit-outlined',
           label: 'label.edit',
           dataView: true,
+          popup: true,
           args: ['osnameforhypervisor', 'osmappingcheckenabled']
         },
         {
@@ -174,7 +175,6 @@ export default {
           icon: 'delete-outlined',
           label: 'label.action.delete.guest.os.hypervisor.mapping',
           message: 'message.action.delete.guest.os.hypervisor.mapping',
-          docHelp: 'adminguide/service_offerings.html#modifying-or-deleting-a-service-offering',
           dataView: true,
           popup: true
         }