diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue
index a6efc73ab4c..5334dab3f81 100644
--- a/ui/src/components/view/InfoCard.vue
+++ b/ui/src/components/view/InfoCard.vue
@@ -70,7 +70,7 @@
 
       <div class="resource-detail-item" v-if="resource.keypair">
         <a-icon type="key" />
-        <router-link :to="{ path: '/ssh/?name=' + resource.keypair }">{{ resource.keypair }}</router-link>
+        <router-link :to="{ path: '/ssh/' + resource.keypair }">{{ resource.keypair }}</router-link>
       </div>
       <div class="resource-detail-item" v-if="resource.group">
         <a-icon type="gold" />{{ resource.group }}
diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 32e6bfe712c..1e36f6512a8 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -18,7 +18,7 @@
 
     <a slot="name" slot-scope="text, record" href="javascript:;">
       <router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ text }}</router-link>
-      <router-link :to="{ path: $route.path + '/?name=' + record.name }" v-else>{{ text }}</router-link>
+      <router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ text }}</router-link>
     </a>
     <a slot="displayname" slot-scope="text, record" href="javascript:;">
       <router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 3551728ef94..8c3e8616f1c 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -329,6 +329,9 @@ export default {
       this.loading = true
       if (this.$route.params && this.$route.params.id) {
         params['id'] = this.$route.params.id
+        if (this.$route.path.startsWith('/ssh/')) {
+          params['name'] = this.$route.params.id
+        }
       }
       params['page'] = this.page
       params['pagesize'] = this.pageSize
@@ -358,9 +361,6 @@ export default {
         }
         if (this.items.length > 0) {
           this.resource = this.items[0]
-          if (this.items && this.items.length === 1 && Object.keys(this.$route.query).length > 0) {
-            this.dataView = true
-          }
         } else {
           this.resource = {}
         }