diff --git a/platypush/backend/http/webapp/src/components/Modal.vue b/platypush/backend/http/webapp/src/components/Modal.vue
index f99ee7213c..e822f4b34f 100644
--- a/platypush/backend/http/webapp/src/components/Modal.vue
+++ b/platypush/backend/http/webapp/src/components/Modal.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="modal-container fade-in" :id="id" :class="{hidden: !isVisible}" :style="{'--z-index': zIndex}" @click="close">
-    <div class="modal">
+    <div class="modal" :class="$attrs.class">
       <div class="content" :style="{'--width': width, '--height': height}" @click="$event.stopPropagation()">
         <div class="header" v-text="title" v-if="title"></div>
         <div class="body">
@@ -188,4 +188,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Modal.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Modal.vue
index e130adc7b3..71ae59bd38 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Modal.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Modal.vue
@@ -1,5 +1,5 @@
 <template>
-  <Modal :visible="visible" :title="entity.name || entity.external_id">
+  <Modal :visible="visible" class="entity-modal" :title="entity.name || entity.external_id">
     <ConfirmDialog ref="deleteConfirmDiag" title="Confirm entity deletion" @input="onDelete">
       Are you <b>sure</b> that you want to delete this entity? <br/><br/>
       Note: you should only delete an entity if its plugin has been disabled
@@ -210,6 +210,14 @@ export default {
 
 <style lang="scss" scoped>
 :deep(.modal) {
+  .body {
+    padding: .5em !important;
+
+    .table-row {
+      box-shadow: none;
+    }
+  }
+
   .icon-canvas {
     display: inline-flex;
     align-items: center;