diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js
index b925db31..4ac8b076 100644
--- a/client/src/app-components/ticket-viewer.js
+++ b/client/src/app-components/ticket-viewer.js
@@ -83,6 +83,7 @@ class TicketViewer extends React.Component {
 
     render() {
         const { ticket, userStaff, userId, editable, allowAttachments, assignmentAllowed } = this.props;
+        const showResponseField = (!ticket.closed && (editable || !assignmentAllowed));
 
         return (
             <div className="ticket-viewer">
@@ -107,7 +108,14 @@ class TicketViewer extends React.Component {
                 <div className="ticket-viewer__comments">
                     {ticket.events && ticket.events.map(this.renderTicketEvent.bind(this))}
                 </div>
-                {(!ticket.closed && (editable || !assignmentAllowed)) ? this.renderResponseField() : (this.showDeleteButton()) ? this.renderDeleteTicketButton() : null}
+                <div className="ticket-viewer__reopen-closeticket-buttons">
+                    {!showResponseField ? this.renderReopenTicketButton() : null}
+                    {
+                        showResponseField ?
+                            this.renderResponseField() :
+                            (this.showDeleteButton()) ? this.renderDeleteTicketButton() : null
+                    }
+                </div>
             </div>
         );
     }
@@ -247,15 +255,19 @@ class TicketViewer extends React.Component {
         return  (
             <div className="ticket-viewer__edit-status__buttons">
                 {this.renderCancelButton("Status")}
-                {this.props.ticket.closed ?
-                    <Button type='secondary' size="medium" onClick={this.onReopenClick.bind(this)}>
-                        {i18n('RE_OPEN')}
-                    </Button> :
-                    this.renderCloseTicketButton()}
+                {this.props.ticket.closed ? this.renderReopenTicketButton() : this.renderCloseTicketButton()}
             </div>
         );
     }
 
+    renderReopenTicketButton() {
+        return (
+            <Button type='secondary' size="medium" onClick={this.onReopenClick.bind(this)}>
+                {i18n('RE_OPEN')}
+            </Button>
+        );
+    }
+
     renderHeaders() {
         const ticket = this.props.ticket;
 
diff --git a/client/src/app-components/ticket-viewer.scss b/client/src/app-components/ticket-viewer.scss
index d8da7d6e..1869870a 100644
--- a/client/src/app-components/ticket-viewer.scss
+++ b/client/src/app-components/ticket-viewer.scss
@@ -168,6 +168,13 @@
         position: relative;
     }
 
+    &__reopen-closeticket-buttons {
+        width: 230px;
+        display: flex;
+        justify-content: space-between;
+        align-content: center;
+    }
+    
     &__response {
         margin-top: 20px;
         position: relative;
@@ -215,8 +222,8 @@
 
     }
 
-    &__delete-button {
-    }
+    // &__delete-button {
+    // }
 
     @media screen and (max-width: 1151px) {
         .ticket-viewer__info  {