diff --git a/static/js/devices.js b/static/js/devices.js
index 717ce7e..a943215 100644
--- a/static/js/devices.js
+++ b/static/js/devices.js
@@ -192,7 +192,7 @@ function filtertables() {
         orga_id = $("#orgaselect option:selected").val();
         $("tbody tr").each(function(i, row)
 		{
-			if ($.inArray(parseInt(orga_id, "10"), $(row).data('orga')) !== -1) $(row).show();
+			if ($(row).attr('class') == "orgarow" || $(row).data('orga') && $.inArray(parseInt(orga_id, "10"), $(row).data('orga')) !== -1) $(row).show();
 			else $(row).hide();
 		});
 
diff --git a/templates/manager/index.html b/templates/manager/index.html
index f953766..9b0906b 100644
--- a/templates/manager/index.html
+++ b/templates/manager/index.html
@@ -146,7 +146,7 @@
                         </thead>
                         {% userOrgas as organizations %}
                         {% for orga in organizations %}
-                        <tr>
+                        <tr class="orgarow">
                                 <td><div style="display:inline;">{{ orga.name }}</div></td>
 				<td>{{ orga.users.all|length }}{% if orga.userlimit %}/{{ orga.userlimit }}{% endif %}</td>
                                 <td><a href="/organizations/{{ orga.id }}/edit"><i class="fas fa-edit" title="Edit Organization"></i></a> <a href="#"><i style="color: darkred;" onclick="askdeleteorga({{ orga.id }});" class="fas fa-trash-alt" title="Delete Organization"></i></a></td>