diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 2f28cb65e..16b73b83e 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -563,11 +563,11 @@ class RepositoriesController < ApplicationController
 
   def set_breadcrumbs_items
     @breadcrumbs_items = []
-    archived_branch = @repository&.archived? || (!@repository && params[:archived] == 'true')
+    archived_branch = @repository&.archived? || (!@repository && params[:view_mode] == 'archived')
 
     @breadcrumbs_items.push({
                               label: t('breadcrumbs.inventories'),
-                              url: archived_branch ? repositories_path(archived: true) : repositories_path,
+                              url: archived_branch ? repositories_path(view_mode: 'archived') : repositories_path,
                               archived: archived_branch
                             })
 
diff --git a/app/javascript/vue/repositories/table.vue b/app/javascript/vue/repositories/table.vue
index 58f38de38..ed3fe33f8 100644
--- a/app/javascript/vue/repositories/table.vue
+++ b/app/javascript/vue/repositories/table.vue
@@ -175,7 +175,7 @@ export default {
     },
     toolbarActions() {
       const left = [];
-      if (this.createUrl) {
+      if (this.createUrl && this.currentViewMode !== 'archived') {
         left.push({
           name: 'create',
           icon: 'sn-icon sn-icon-new-task',
diff --git a/app/javascript/vue/repository/state_menu.vue b/app/javascript/vue/repository/state_menu.vue
index 53d8ad620..7e798ccdb 100644
--- a/app/javascript/vue/repository/state_menu.vue
+++ b/app/javascript/vue/repository/state_menu.vue
@@ -1,7 +1,7 @@
 <template>
   <MenuDropdown
     :listItems="viewModesMenu"
-    :btnClasses="'btn btn-secondary !border-sn-light-grey px-3'"
+    :btnClasses="'btn btn-secondary !border-sn-light-grey px-3 prevent-shrink' + disabled"
     :btnText="btnText"
     :caret="true"
     position='right'>
@@ -26,6 +26,9 @@ export default {
     delete window.initRepositoryStateMenu;
   },
   computed: {
+    disabled() {
+      return this.viewMode === 'archived' ? ' disabled' : '';
+    },
     btnText() {
       return I18n.t(`toolbar.${this.viewMode}_state`);
     },
diff --git a/app/views/repositories/index.html.erb b/app/views/repositories/index.html.erb
index b407e6adf..5ebb72a01 100644
--- a/app/views/repositories/index.html.erb
+++ b/app/views/repositories/index.html.erb
@@ -3,7 +3,7 @@
 
 <% if current_team %>
   <% provide(:sidebar_url, sidebar_repositories_path) %>
-  <div class="content-pane flexible <%= params[:archived] ? :archived : :active %> repositories-index">
+  <div class="content-pane flexible <%= params[:view_mode] ? :archived : :active %> repositories-index">
     <div class="content-header">
       <div class="title-row">
         <h1 data-view-mode="active"><%= t('libraries.index.head_title') %></h1>