diff --git a/app/assets/javascripts/projects/canvas.js.erb b/app/assets/javascripts/projects/canvas.js.erb
index 69abee226..8879d2b34 100644
--- a/app/assets/javascripts/projects/canvas.js.erb
+++ b/app/assets/javascripts/projects/canvas.js.erb
@@ -717,6 +717,10 @@ function bindFullZoomAjaxTabs() {
     target.addClass("active");
     $this.parents(".module-large").addClass("expanded");
 
+    // Add class to bring it in front on archived tasks page (hover other cards when open comments/users)
+    $this.parents('#module-archive').find('.module-container').removeClass('active-card');
+    $this.parents('.module-container').addClass('active-card');
+
     // Call scrollBotton after the comments are displayed
     // so that the scrollHight can be calculated
     if ( targetContents === 'comments' ) {
diff --git a/app/assets/stylesheets/my_modules.scss b/app/assets/stylesheets/my_modules.scss
index 947ddc76a..24cd5ad1f 100644
--- a/app/assets/stylesheets/my_modules.scss
+++ b/app/assets/stylesheets/my_modules.scss
@@ -203,6 +203,10 @@
 
   .module-container {
     min-width: 220px;
+
+    &.active-card {
+      z-index: 1000;
+    }
   }
 
   .panel-default {
@@ -245,6 +249,8 @@
 
       .tab-content {
         background-color: $color-concrete;
+        box-shadow: $flyout-shadow;
+
         .tab-pane > .text-center {
           margin-top: 5px;
         }
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 57345c06d..bec84a8fd 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -18,25 +18,19 @@ Rails.application.config.assets.precompile += %w(jsPlumb-2.0.4-min.js)
 Rails.application.config.assets.precompile += %w(jsnetworkx.js)
 Rails.application.config.assets.precompile += %w(handsontable.full.min.js)
 Rails.application.config.assets.precompile += %w(handsontable.full.min.css)
-Rails.application.config.assets.precompile +=
-  %w(sugar.min.js jquerymy-1.2.14.min.js)
+Rails.application.config.assets.precompile += %w(sugar.min.js jquerymy-1.2.14.min.js)
 Rails.application.config.assets.precompile += %w(users/settings/list_toggle.js.erb)
-Rails.application.config.assets.precompile +=
-  %w(users/settings/account/preferences/index.js)
+Rails.application.config.assets.precompile += %w(users/settings/account/preferences/index.js)
 Rails.application.config.assets.precompile += %w(users/settings/teams/index.js)
-Rails.application.config.assets.precompile +=
-  %w(users/settings/teams/datatable.js)
-Rails.application.config.assets.precompile +=
-  %w(users/settings/teams/add_user_modal.js)
+Rails.application.config.assets.precompile += %w(users/settings/teams/datatable.js)
+Rails.application.config.assets.precompile += %w(users/settings/teams/add_user_modal.js)
 Rails.application.config.assets.precompile += %w(users/settings/teams/show.js)
-Rails.application.config.assets.precompile +=
-  %w(users/settings/teams/invite_users_modal.js)
+Rails.application.config.assets.precompile += %w(users/settings/teams/invite_users_modal.js)
 Rails.application.config.assets.precompile += %w(my_modules/activities.js)
 Rails.application.config.assets.precompile += %w(my_modules/protocols.js)
 Rails.application.config.assets.precompile += %w(my_modules/repositories.js)
 Rails.application.config.assets.precompile += %w(my_modules/status_flow.js)
-Rails.application.config.assets.precompile +=
-  %w(my_modules/protocols/protocol_status_bar.js)
+Rails.application.config.assets.precompile += %w(my_modules/protocols/protocol_status_bar.js)
 Rails.application.config.assets.precompile += %w(my_modules/results.js)
 Rails.application.config.assets.precompile += %w(assets/wopi/create_wopi_file.js)
 Rails.application.config.assets.precompile += %w(results/result_tables.js)
@@ -53,20 +47,16 @@ Rails.application.config.assets.precompile += %w(eventPause-min.js)
 Rails.application.config.assets.precompile += %w(sidebar.js)
 Rails.application.config.assets.precompile += %w(projects/index.js)
 Rails.application.config.assets.precompile += %w(projects/canvas.js)
-Rails.application.config.assets.precompile +=
-  %w(experiments/dropdown_actions.js)
+Rails.application.config.assets.precompile += %w(experiments/dropdown_actions.js)
 Rails.application.config.assets.precompile += %w(reports/new.js)
 Rails.application.config.assets.precompile += %w(protocols/index.js)
 Rails.application.config.assets.precompile += %w(protocols/external_protocols_tab.js)
 Rails.application.config.assets.precompile += %w(protocols/header.js)
 Rails.application.config.assets.precompile += %w(protocols/steps.js)
 Rails.application.config.assets.precompile += %w(protocols/edit.js)
-Rails.application.config.assets.precompile +=
-  %w(protocols/import_export/eln_table.js)
-Rails.application.config.assets.precompile +=
-  %w(protocols/import_export/import.js)
-Rails.application.config.assets.precompile +=
-  %w(protocols/import_export/export.js)
+Rails.application.config.assets.precompile += %w(protocols/import_export/eln_table.js)
+Rails.application.config.assets.precompile += %w(protocols/import_export/import.js)
+Rails.application.config.assets.precompile += %w(protocols/import_export/export.js)
 Rails.application.config.assets.precompile += %w(datatables.js)
 Rails.application.config.assets.precompile += %w(search/index.js)
 Rails.application.config.assets.precompile += %w(global_activities/side_pane.js)
@@ -87,8 +77,7 @@ Rails.application.config.assets.precompile += %w(highlightjs-github-theme.css)
 Rails.application.config.assets.precompile += %w(search.js)
 Rails.application.config.assets.precompile += %w(repositories/index.js)
 Rails.application.config.assets.precompile += %w(repositories/edit.js)
-Rails.application.config.assets.precompile +=
-  %w(repositories/repository_datatable.js)
+Rails.application.config.assets.precompile += %w(repositories/repository_datatable.js)
 Rails.application.config.assets.precompile += %w(activities/index.js)
 Rails.application.config.assets.precompile += %w(global_activities/index.js)
 Rails.application.config.assets.precompile += %w(repositories/show.js)