diff --git a/client/src/components/Page/PageDropdown.vue b/client/src/components/Page/PageDropdown.vue
index eb0f9948750a..6aacf596e126 100644
--- a/client/src/components/Page/PageDropdown.vue
+++ b/client/src/components/Page/PageDropdown.vue
@@ -15,19 +15,19 @@
                 <span class="fa fa-eye fa-fw mr-1" />
                 <span>View</span>
             </a>
-            <a class="dropdown-item dropdown-item-edit" v-if="!readOnly" :href="urlEdit">
+            <a v-if="!readOnly" class="dropdown-item dropdown-item-edit" :href="urlEdit">
                 <span class="fa fa-edit fa-fw mr-1" />
                 <span>Edit Content</span>
             </a>
-            <a class="dropdown-item dropdown-item-edit-attributes" v-if="!readOnly" :href="urlEditAttributes">
+            <a v-if="!readOnly" class="dropdown-item dropdown-item-edit-attributes" :href="urlEditAttributes">
                 <span class="fa fa-share-alt fa-fw mr-1" />
                 <span>Edit Attributes</span>
             </a>
-            <a class="dropdown-item dropdown-item-share" v-if="!readOnly" :href="urlShare">
+            <a v-if="!readOnly" class="dropdown-item dropdown-item-share" :href="urlShare">
                 <span class="fa fa-share-alt fa-fw mr-1" />
                 <span>Share</span>
             </a>
-            <a class="dropdown-item" href="#" v-if="!readOnly" @click.prevent="onDelete">
+            <a v-if="!readOnly" class="dropdown-item" href="#" @click.prevent="onDelete">
                 <span class="fa fa-trash fa-fw mr-1" />
                 <span>Delete</span>
             </a>
diff --git a/client/src/components/Page/PageList.vue b/client/src/components/Page/PageList.vue
index bb7e530d82ac..209d05402f5f 100644
--- a/client/src/components/Page/PageList.vue
+++ b/client/src/components/Page/PageList.vue
@@ -9,7 +9,7 @@
                 <PageIndexActions :root="root" class="float-right" />
             </b-col>
         </b-row>
-        <b-table :fields="fields" v-model="itemsModel" v-bind="indexTableAttrs">
+        <b-table v-model="itemsModel" :fields="fields" v-bind="indexTableAttrs">
             <template v-slot:empty>
                 <loading-span v-if="loading" message="Loading pages" />
                 <b-alert v-else id="no-pages" variant="info" show>
@@ -34,9 +34,9 @@
                 <Tags
                     :index="row.index"
                     :tags="row.item.tags"
+                    :disabled="published"
                     @input="onTags"
-                    @tag-click="onTagClick"
-                    :disabled="published" />
+                    @tag-click="onTagClick" />
             </template>
             <template v-slot:cell(published)="row">
                 <SharingIndicators :object="row.item" @filter="(filter) => appendFilter(filter)" />
@@ -53,8 +53,8 @@
             </template>
         </b-table>
         <b-pagination
-            v-model="currentPage"
             v-if="rows >= perPage"
+            v-model="currentPage"
             class="gx-pages-grid-pager"
             v-bind="paginationAttrs"></b-pagination>
     </div>
@@ -119,6 +119,7 @@ export default {
         PageDropdown,
         PageUrl,
     },
+    mixins: [paginationMixin, filtersMixin],
     props: {
         published: {
             // Render the published workflows version of this grid.
@@ -126,7 +127,6 @@ export default {
             default: true,
         },
     },
-    mixins: [paginationMixin, filtersMixin],
     data() {
         const fields = this.published ? PUBLISHED_FIELDS : PERSONAL_FIELDS;
         const implicitFilter = this.published ? "is:published" : null;
@@ -142,15 +142,6 @@ export default {
             implicitFilter: implicitFilter,
         };
     },
-    created() {
-        this.root = getAppRoot();
-        // this.services = new Services({ root: this.root });
-    },
-    watch: {
-        filter(val) {
-            this.refresh();
-        },
-    },
     computed: {
         dataProviderParameters() {
             const extraParams = { search: this.effectiveFilter };
@@ -161,6 +152,15 @@ export default {
             return extraParams;
         },
     },
+    watch: {
+        filter(val) {
+            this.refresh();
+        },
+    },
+    created() {
+        this.root = getAppRoot();
+        // this.services = new Services({ root: this.root });
+    },
     methods: {
         onTags: function (tags, index) {
             const workflow = this.itemsModel[index];