diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/message-editor.fxml b/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/message-editor.fxml
index f71426b..9f7c55e 100644
--- a/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/message-editor.fxml
+++ b/sampler/src/main/resources/atlantafx/sampler/assets/fxml/blueprints/message-editor.fxml
@@ -15,7 +15,7 @@
    <children>
       <HBox spacing="10.0">
          <children>
-            <TextField promptText="Untitled paragraph" styleClass="no-border" HBox.hgrow="ALWAYS" />
+            <TextField promptText="Untitled paragraph" styleClass="edge-to-edge" HBox.hgrow="ALWAYS" />
             <Button mnemonicParsing="false">
                <graphic>
                   <FontIcon iconLiteral="mdomz-more_horiz" />
@@ -133,7 +133,7 @@
          </children>
       </HBox>
       <Separator prefWidth="200.0" styleClass="small" />
-      <TextArea prefHeight="100.0" promptText="It's great time to write your content" styleClass="no-border" VBox.vgrow="ALWAYS" />
+      <TextArea prefHeight="100.0" promptText="It's great time to write your content" styleClass="edge-to-edge" VBox.vgrow="ALWAYS" />
    </children>
    <padding>
       <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
diff --git a/sampler/src/main/resources/atlantafx/sampler/assets/styles/scss/page/_showcase.scss b/sampler/src/main/resources/atlantafx/sampler/assets/styles/scss/page/_showcase.scss
index c447c15..787c0d9 100644
--- a/sampler/src/main/resources/atlantafx/sampler/assets/styles/scss/page/_showcase.scss
+++ b/sampler/src/main/resources/atlantafx/sampler/assets/styles/scss/page/_showcase.scss
@@ -53,8 +53,4 @@
     -fx-background-insets: 0, 1;
     -fx-background-radius: 10px;
   }
-
-  .no-border {
-    -fx-background-insets: 0;
-  }
 }
diff --git a/styles/src/components/_text-input.scss b/styles/src/components/_text-input.scss
index 4aa7217..d584948 100755
--- a/styles/src/components/_text-input.scss
+++ b/styles/src/components/_text-input.scss
@@ -86,6 +86,12 @@ $color-fg-password: -color-fg-muted !default;
     -fx-background-color: -color-input-border-focused, -color-input-bg-readonly;
   }
 
+  &.edge-to-edge {
+    -fx-background-color: -color-input-bg;
+    -fx-background-insets: 0;
+    -fx-background-radius: 0;
+  }
+
   // input group
   &.left-pill {
     -fx-background-radius: cfg.$border-radius 0 0 cfg.$border-radius, cfg.$inner-border-radius 0 0 cfg.$inner-border-radius;