diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue
index 3081324ca..4bd155fea 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Selector.vue
@@ -231,6 +231,7 @@ export default {
   @include from($tablet) {
     .search-bar {
       min-width: 400px;
+      margin-left: 0.5em;
     }
   }
 
@@ -239,59 +240,15 @@ export default {
     display: flex;
 
     .dropdown {
-      min-width: 10em;
-
-      .text {
-        text-align: left;
-        padding-left: 0.5em;
-      }
+      min-width: 11em;
     }
 
-    .dropdown-container {
-      button {
-        width: 100%;
-        background: none;
-        text-align: left;
-        letter-spacing: 0.01em;
-
-        .text {
-          padding-left: 0.25em;
-        }
-
-        .icon.active {
-          color: $selected-fg;
-        }
-      }
+    .icon.active {
+      color: $selected-fg;
     }
 
     button {
       height: 100%;
-      background: $default-bg-2;
-      border: 0;
-      padding: 0.5em;
-
-      &:hover {
-        color: $default-hover-fg;
-      }
-    }
-
-    .item {
-      padding: 0.75em 0.5em;
-      border: 0;
-      box-shadow: none;
-
-      .col-1.icon {
-        width: 1.5em;
-      }
-
-      &.selected {
-        font-weight: bold;
-        background: #ffffff00;
-      }
-
-      &:hover {
-        background: $hover-bg;
-      }
     }
   }
 }
diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Variable.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Variable.vue
index 1749f9957..0f85e01e5 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Variable.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Variable.vue
@@ -47,6 +47,7 @@ export default {
   name: 'Variable',
   components: {EntityIcon},
   mixins: [EntityMixin],
+  emits: ['loading'],
   data: function() {
     return {
       collapsed: true,