diff --git a/client/src/app-components/department-dropdown.js b/client/src/app-components/department-dropdown.js
index 83d92110..2eca04ed 100644
--- a/client/src/app-components/department-dropdown.js
+++ b/client/src/app-components/department-dropdown.js
@@ -1,6 +1,4 @@
 import React from 'react';
-import {connect} from 'react-redux';
-import classNames from 'classnames';
 
 import DropDown from 'core-components/drop-down';
 import Icon from 'core-components/icon';
diff --git a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
index 81149352..827fc161 100644
--- a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
+++ b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
@@ -79,7 +79,7 @@ class CreateTicketForm extends React.Component {
                         fieldProps={{allowImages: allowAttachments}}
                         required
                         field="textarea" />
-                    <div className="create-ticket-form__buttons-container">
+                    <div className={`create-ticket-form__buttons-container${allowAttachments ? "" : "-without-allow-attachments"}`}>
                         {allowAttachments ? this.renderFileUpload() : null}
                         {(!userLogged) ? this.renderCaptcha() : null}
                         <SubmitButton type="secondary">{i18n('CREATE_TICKET')}</SubmitButton>
diff --git a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.scss b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.scss
index 0da4e3f1..755b5449 100644
--- a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.scss
+++ b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.scss
@@ -13,6 +13,14 @@
         flex-direction: row;
         justify-content: space-between;
         align-items: center;
+
+        &-without-allow-attachments {
+            display: flex;
+            flex-direction: row;
+            justify-content: flex-end;
+            align-items: center;
+            width: 100%;
+        }
     }
 
     &__captcha {