diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala
index 4e25f82c2..a8796704d 100644
--- a/src/main/scala/app/SystemSettingsController.scala
+++ b/src/main/scala/app/SystemSettingsController.scala
@@ -153,7 +153,7 @@ trait SystemSettingsControllerBase extends ControllerBase {
               if(installedPlugins.exists(_.id == properties.getProperty("id"))) "installed" else "available")
           }
         } else Nil
-      }
+      }.filter(x => !installedPlugins.exists(_.id == x.id))
     } else Nil
   }
 }
diff --git a/src/main/twirl/admin/plugins/available.scala.html b/src/main/twirl/admin/plugins/available.scala.html
index 73e914a05..ee5eeff5d 100644
--- a/src/main/twirl/admin/plugins/available.scala.html
+++ b/src/main/twirl/admin/plugins/available.scala.html
@@ -15,13 +15,8 @@
         @plugins.zipWithIndex.map { case (plugin, i) =>
           <tr>
             <td>
-              @*
               <input type="checkbox" name="pluginId[@i]" value="@plugin.id"/>
-              *@
               @plugin.id
-              @if(plugin.status == "installed"){
-                [Installed]
-              }
             </td>
             <td>@plugin.version</td>
             <td><a href="@plugin.url">@plugin.author</a></td>
@@ -29,9 +24,7 @@
           </tr>
         }
       </table>
-      @*
       <input type="submit" id="install-plugins" class="btn btn-primary" value="Install selected plugins"/>
-      *@
     </form>
   }
 }