diff --git a/webextension/css/popup.css b/webextension/css/popup.css
index bad469d..3c8f79b 100644
--- a/webextension/css/popup.css
+++ b/webextension/css/popup.css
@@ -79,7 +79,6 @@ table {
 table.unstriped tbody tr {
   border-bottom: 1px solid #f1f1f1;
   background-color: #fefefe;
-  cursor: pointer;
 }
 
 .userContext-icon {
diff --git a/webextension/js/popup.js b/webextension/js/popup.js
index 359d567..297fcec 100644
--- a/webextension/js/popup.js
+++ b/webextension/js/popup.js
@@ -330,7 +330,6 @@ Logic.registerPanel(P_CONTAINERS_EDIT, {
     Logic.identities().forEach(identity => {
       let tr = document.createElement("tr");
       fragment.appendChild(tr);
-      tr.classList.add("clickable");
       tr.innerHTML = `
         <td>
           <div class="userContext-icon"
@@ -343,12 +342,12 @@ Logic.registerPanel(P_CONTAINERS_EDIT, {
           <img
             title="Edit ${identity.name} container"
             src="/img/container-edit.svg"
-            class="icon edit-container-icon" />
+            class="icon edit-container-icon clickable" />
         </td>
         <td class="remove-container" >
           <img
             title="Remove ${identity.name} container"
-            class="icon delete-container-icon"
+            class="icon delete-container-icon clickable"
             src="/img/container-delete.svg"
           />
         </td>`;
diff --git a/webextension/popup.html b/webextension/popup.html
index 2c961ce..856f583 100644
--- a/webextension/popup.html
+++ b/webextension/popup.html
@@ -57,10 +57,10 @@
           <span class="userContext-icon" id="container-info-icon" data-identity-icon="" data-identity-color=""></span>
           <h3 id="container-info-name" class="panel-header-text"></h3>
         </div>
-        <div class="row container-info-panel-hide clickable" id="container-info-hideorshow" data-user-context-id="">
+        <div class="row container-info-panel-hide container-info-has-tabs clickable" id="container-info-hideorshow" data-user-context-id="">
           <img id="container-info-hideorshow-icon" alt="Hide Container icon" src="/img/container-hide.svg" class="icon container-info-panel-hideorshow-icon"/><span id="container-info-hideorshow-label">Hide this container</span><br/>
         </div>
-        <div class="row container-info-panel-movetabs clickable" id="container-info-movetabs">
+        <div class="row container-info-panel-movetabs container-info-has-tabs clickable" id="container-info-movetabs">
           Move tabs to a new window
         </div>
         <table class="unstriped" id="container-info-table">