diff --git a/VDS/Components/TextFields/EntryField/EntryField.swift b/VDS/Components/TextFields/EntryField/EntryField.swift
index d1d0ada0..851fb0e5 100644
--- a/VDS/Components/TextFields/EntryField/EntryField.swift
+++ b/VDS/Components/TextFields/EntryField/EntryField.swift
@@ -184,8 +184,12 @@ open class EntryField: Control, Accessable {
         stackView.setCustomSpacing(8, after: container)
         stackView.setCustomSpacing(8, after: errorLabel)
 
-        stackView.pinToSuperView()
-                
+        stackView
+            .pinTop()
+            .pinBottom()
+            .pinLeading()
+            .trailingAnchor.constraint(lessThanOrEqualTo: trailingAnchor).isActive = true
+
         titleLabel.textColorConfiguration = primaryColorConfig.eraseToAnyColorable()
         errorLabel.textColorConfiguration = primaryColorConfig.eraseToAnyColorable()
         helperLabel.textColorConfiguration = secondaryColorConfig.eraseToAnyColorable()