diff --git a/addon/components/chat-window.js b/addon/components/chat-window.js
index dd6e768..5bc471e 100644
--- a/addon/components/chat-window.js
+++ b/addon/components/chat-window.js
@@ -32,6 +32,11 @@ export default class ChatWindowComponent extends Component {
         const multiplier = this.chat.openChannels.length - 1;
         const marginRight = (chatWindowWidth + 20) * multiplier;
         chatWindowElement.style.marginRight = `${marginRight}px`;
+
+        // reposition when chat is closed
+        this.chat.on('chat.closed', () => {
+            this.positionWindow(chatWindowElement);
+        });
     }
 
     @action autoScrollMessagesWindow(messagesWindowContainerElement) {
@@ -43,7 +48,6 @@ export default class ChatWindowComponent extends Component {
 
     getSenderFromParticipants(channel) {
         const participants = channel.participants ?? [];
-        console.log('#participants', participants);
         const sender = participants.find((chatParticipant) => {
             return chatParticipant.user_uuid === this.currentUser.id;
         });
diff --git a/addon/components/layout/header.hbs b/addon/components/layout/header.hbs
index 0971127..f14932f 100644
--- a/addon/components/layout/header.hbs
+++ b/addon/components/layout/header.hbs
@@ -29,7 +29,7 @@
         <Layout::Header::LoadingIndicator />
         <div id="view-header-actions"></div>
         <div class="flex items-center justify-between">
-            <div class="flex-1 flex items-center pr-1 space-x-2">
+            <div class="flex-1 flex items-center pr-1 space-x-1">
                 <LocaleSelectorTray />
                 <NotificationTray @registerAPI={{@registerNotificationTrayApi}} @onClickNotification={{@onClickNotification}} />
                 <ChatTray />