diff --git a/platform/core/common/styles/_chips.scss b/platform/core/common/styles/_chips.scss
index 64580a8..61e3499 100644
--- a/platform/core/common/styles/_chips.scss
+++ b/platform/core/common/styles/_chips.scss
@@ -38,36 +38,8 @@
   margin: 22px 8px 0 0;
 }
 
-body[fds] .mat-basic-chip.td-chip-after-pad {
-  padding: 4px 12px 4px 12px;
-}
-
 body[fds] .mat-basic-chip i {
   margin-left: 10px;
   float: right;
   margin-top: 2px;
 }
-
-body[fds] .mat-basic-chip .td-chip {
-  font-size: 10px;
-  min-height: unset;
-  line-height: 20px;
-  position: relative;
-  top: -3px;
-}
-
-body[fds] .td-chip span {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width: 65px;
-}
-
-body[fds] .td-chip-disabled .td-chip {
-  padding: 0 0 0 12px;
-}
-
-body[fds] .mat-basic-chip mat-icon.td-chip-removal {
-  font-size: 15px;
-  margin-bottom: 7px;
-}
diff --git a/platform/core/common/styles/_td-chips.scss b/platform/core/common/styles/_td-chips.scss
index dd01379..106e921 100644
--- a/platform/core/common/styles/_td-chips.scss
+++ b/platform/core/common/styles/_td-chips.scss
@@ -33,6 +33,35 @@
   }
 }
 
+body[fds] .mat-basic-chip.td-chip-after-pad {
+    padding: 4px 12px 4px 12px;
+}
+
+body[fds] .mat-basic-chip .td-chip {
+    font-size: 10px;
+    min-height: unset;
+    line-height: 20px;
+    position: relative;
+    top: -3px;
+}
+
 body[fds] .td-chip span {
-  font-size: 10px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 65px;
+    font-size: 10px;
+}
+
+body[fds] .td-chip-disabled .td-chip {
+    padding: 0 0 0 12px;
+}
+
+body[fds] .mat-basic-chip mat-icon.td-chip-removal {
+    font-size: 15px;
+    margin-bottom: 7px;
+}
+
+body[fds] mat-form-field.td-chips-form-field.mat-input-container {
+    width: unset;
 }