diff --git a/client/web/compose/src/components/PageBlocks/Configurator.vue b/client/web/compose/src/components/PageBlocks/Configurator.vue
index 7184867e3..c5b9e49c3 100644
--- a/client/web/compose/src/components/PageBlocks/Configurator.vue
+++ b/client/web/compose/src/components/PageBlocks/Configurator.vue
@@ -96,6 +96,13 @@
           >
             {{ $t('general.wrap') }}
           </b-form-checkbox>
+
+          <b-form-checkbox
+            v-model="block.style.border.enabled"
+            switch
+          >
+            {{ $t('general.border.show') }}
+          </b-form-checkbox>
         </b-col>
 
         <b-col
diff --git a/client/web/compose/src/components/PageBlocks/Wrap/Card.vue b/client/web/compose/src/components/PageBlocks/Wrap/Card.vue
index 3c7e4c02b..9efc9698c 100644
--- a/client/web/compose/src/components/PageBlocks/Wrap/Card.vue
+++ b/client/web/compose/src/components/PageBlocks/Wrap/Card.vue
@@ -2,7 +2,7 @@
   <div class="h-100">
     <b-card
       no-body
-      class="h-100 border-0 shadow"
+      class="h-100 shadow"
       :class="blockClass"
     >
       <b-card-header
diff --git a/client/web/compose/src/components/PageBlocks/Wrap/Plain.vue b/client/web/compose/src/components/PageBlocks/Wrap/Plain.vue
index 867dd335e..29248bd77 100644
--- a/client/web/compose/src/components/PageBlocks/Wrap/Plain.vue
+++ b/client/web/compose/src/components/PageBlocks/Wrap/Plain.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="h-100">
     <div
-      class="d-flex flex-column border position-relative h-100 card bg-transparent"
+      class="card bg-transparent h-100"
       :class="blockClass"
     >
       <div
diff --git a/client/web/compose/src/components/PageBlocks/Wrap/base.vue b/client/web/compose/src/components/PageBlocks/Wrap/base.vue
index 2418ae61a..888c7ed30 100644
--- a/client/web/compose/src/components/PageBlocks/Wrap/base.vue
+++ b/client/web/compose/src/components/PageBlocks/Wrap/base.vue
@@ -22,6 +22,7 @@ export default {
     blockClass () {
       return [
         'block',
+        { border: this.block.style.border.enabled },
         this.block.kind,
       ]
     },
diff --git a/lib/js/src/compose/types/page-block/base.ts b/lib/js/src/compose/types/page-block/base.ts
index 3bc335a1c..3906c1972 100644
--- a/lib/js/src/compose/types/page-block/base.ts
+++ b/lib/js/src/compose/types/page-block/base.ts
@@ -9,9 +9,14 @@ interface PageBlockStyleWrap {
   kind: string;
 }
 
+interface PageBlockStyleBorder {
+  enabled?: boolean;
+}
+
 interface PageBlockStyle {
   variants: PageBlockStyleVariants;
   wrap?: PageBlockStyleWrap;
+  border?: PageBlockStyleBorder;
 }
 
 export type PageBlockInput = PageBlock | Partial<PageBlock>
@@ -36,6 +41,9 @@ export class PageBlock {
     wrap: {
       kind: 'card',
     },
+    border: {
+      enabled: false,
+    },
   }
 
   constructor (i?: PageBlockInput) {
diff --git a/locale/en/corteza-webapp-compose/block.yaml b/locale/en/corteza-webapp-compose/block.yaml
index 961ab77f6..2310d23d9 100644
--- a/locale/en/corteza-webapp-compose/block.yaml
+++ b/locale/en/corteza-webapp-compose/block.yaml
@@ -125,6 +125,8 @@ general:
     show: Show refresh button
     description: Setting value to 5 seconds or more enables auto-refresh
     rate: seconds
+  border:
+    show: Show border
   label:
     add: Add
     back: Back
diff --git a/server/compose/types/page.go b/server/compose/types/page.go
index 584ad0a4d..7e5b1fe9c 100644
--- a/server/compose/types/page.go
+++ b/server/compose/types/page.go
@@ -71,8 +71,9 @@ type (
 	}
 
 	PageBlockStyle struct {
-		Variants map[string]string `json:"variants,omitempty"`
-		Wrap     map[string]string `json:"wrap,omitempty"`
+		Variants map[string]string      `json:"variants,omitempty"`
+		Wrap     map[string]string      `json:"wrap,omitempty"`
+		Border   map[string]interface{} `json:"border,omitempty"`
 	}
 
 	PageButton struct {