diff --git a/ui/src/app/components/gateway/gateway-config-select.scss b/ui/src/app/components/gateway/gateway-config-select.scss
index 1c189a7279..da2e7ba432 100644
--- a/ui/src/app/components/gateway/gateway-config-select.scss
+++ b/ui/src/app/components/gateway/gateway-config-select.scss
@@ -27,9 +27,3 @@
 .tb-gateway-autocomplete-container.md-virtual-repeat-container.md-autocomplete-suggestions-container{
   z-index: 70;
 }
-
-md-autocomplete{
-  md-input-container{
-    margin-bottom: 0;
-  }
-}
diff --git a/ui/src/app/components/gateway/gateway-form.tpl.html b/ui/src/app/components/gateway/gateway-form.tpl.html
index c8d44d1fcb..13603b2cfc 100644
--- a/ui/src/app/components/gateway/gateway-form.tpl.html
+++ b/ui/src/app/components/gateway/gateway-form.tpl.html
@@ -39,12 +39,11 @@
                                                   get_access_token="vm.getAccessToken"
                                                   create-device="vm.createDevice">
                         </tb-gateway-config-select>
-                        <md-input-container ng-if="vm.isStateForm"
-                                            class="md-block">
+                        <md-input-container ng-if="vm.isStateForm" class="md-block">
                             <label>{{'gateway.gateway-name' | translate }}</label>
                             <input ng-disabled="true" type="text" ng-model="vm.configurations.gateway.name" name="gatewayName"/>
                         </md-input-container>
-                        <md-input-container class="md-block">
+                        <md-input-container class="md-block" style="margin-top: 0;">
                             <label>{{'gateway.security-type' | translate }}</label>
                             <md-select ng-disabled="vm.isReadOnlyForm" name="securityType" ng-model="vm.configurations.securityType" required>
                                 <md-option ng-repeat="securityType in vm.securityTypes" ng-value="securityType.value">