diff --git a/app/assets/stylesheets/my_modules/repositories.scss b/app/assets/stylesheets/my_modules/repositories.scss
index 95557fd1b..b79e9169e 100644
--- a/app/assets/stylesheets/my_modules/repositories.scss
+++ b/app/assets/stylesheets/my_modules/repositories.scss
@@ -75,7 +75,7 @@
   }
 }
 
-.my-module-assigned-repositories {
+#assigned-items-container {
   .assigned-repository {
     border: $border-default;
     border-radius: $border-radius-modal;
@@ -136,5 +136,9 @@
         }
       }
     }
+
+    &:hover {
+      background: $color-concrete;
+    }
   }
 }
diff --git a/app/models/my_module.rb b/app/models/my_module.rb
index 4b2c4e599..8d77f9769 100644
--- a/app/models/my_module.rb
+++ b/app/models/my_module.rb
@@ -206,10 +206,7 @@ class MyModule < ApplicationRecord
   end
 
   def assigned_repositories
-    assigned_repositories_ids = repository_rows.group('repository_id')
-                                               .select('repository_id')
-                                               .pluck('repository_id')
-    Repository.where(id: assigned_repositories_ids)
+    Repository.where(id: repository_rows.select('DISTINCT(repository_id)'))
   end
 
   def unassigned_users
diff --git a/app/views/my_modules/inventories/_inventories_list.html.erb b/app/views/my_modules/inventories/_inventories_list.html.erb
deleted file mode 100644
index b3f4148f9..000000000
--- a/app/views/my_modules/inventories/_inventories_list.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="my-module-assigned-repositories">
-  <% @assigned_repositories.each do |repository| %>
-    <div class="assigned-repository">
-      <a class="assigned-repository-caret collapsed" role="button"
-         data-toggle="collapse"
-         href="#assigned-repository-items-container-<%= repository.id %>"
-         aria-expanded="false"
-         aria-controls="assigned-repository-items-container-<%= repository.id %>"
-      >
-        <i class="fas fa-caret-right"></i>
-        <span class="assigned-repository-title" data-rows-count="[<%= @my_module.repository_rows_count(repository) %>]">
-          <%= repository.name %>
-        </span>
-        <div class="action-buttons">
-          <i class="fas fa-expand full-screen"></i>
-          <i class="fas fa-trash unassign-repository"></i>
-        </div>
-      </a>
-      <div class="collapse" id="assigned-repository-items-container-<%= repository.id %>">
-        Repository table
-      </div>
-    </div>
-  <% end %>
-</div>
\ No newline at end of file
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb
index c4ce0bee1..da01f3c2e 100644
--- a/app/views/my_modules/protocols.html.erb
+++ b/app/views/my_modules/protocols.html.erb
@@ -38,8 +38,8 @@
         </span>
     </a>
     </div>
-    <div class="collapse" id="assigned-items-container">
-      <%= render partial: "my_modules/inventories/inventories_list" %>
+    <div class="collapse panel-group" id="assigned-items-container">
+      <%= render partial: "my_modules/repositories/repositories_list" %>
     </div>
   </div>
   <!-- Protocol -->
diff --git a/app/views/my_modules/repositories/_repositories_list.html.erb b/app/views/my_modules/repositories/_repositories_list.html.erb
new file mode 100644
index 000000000..1bfa4e697
--- /dev/null
+++ b/app/views/my_modules/repositories/_repositories_list.html.erb
@@ -0,0 +1,24 @@
+<% @assigned_repositories.each do |repository| %>
+  <div class="assigned-repository panel">
+    <a class="assigned-repository-caret collapsed"
+       role="button"
+       data-toggle="collapse"
+       href="#assigned-repository-items-container-<%= repository.id %>"
+       data-parent="#assigned-items-container"
+    >
+      <i class="fas fa-caret-right"></i>
+      <span class="assigned-repository-title" data-rows-count="[<%= @my_module.repository_rows_count(repository) %>]">
+        <%= repository.name %>
+      </span>
+      <div class="action-buttons">
+        <i class="fas fa-expand full-screen"></i>
+        <i class="fas fa-trash unassign-repository"></i>
+      </div>
+    </a>
+    <div class="collapse"
+         id="assigned-repository-items-container-<%= repository.id %>"
+    >
+      Repository table
+    </div>
+  </div>
+<% end %>
\ No newline at end of file