diff --git a/apps/commudle-admin/src/app/feature-modules/user-chats/components/chats-window/chats-window.component.scss b/apps/commudle-admin/src/app/feature-modules/user-chats/components/chats-window/chats-window.component.scss
index 29f2b4557b..e86c313e46 100644
--- a/apps/commudle-admin/src/app/feature-modules/user-chats/components/chats-window/chats-window.component.scss
+++ b/apps/commudle-admin/src/app/feature-modules/user-chats/components/chats-window/chats-window.component.scss
@@ -14,7 +14,7 @@
 
     nb-card-body {
       transition: all 0.2s ease-in-out;
-      @apply com-grid com-p-0;
+      @apply com-flex com-flex-col com-overflow-hidden com-p-0;
     }
   }
 }
diff --git a/apps/shared-components/discussion-personal-chat/discussion-personal-chat.component.html b/apps/shared-components/discussion-personal-chat/discussion-personal-chat.component.html
index cdf0c67965..21f53be134 100644
--- a/apps/shared-components/discussion-personal-chat/discussion-personal-chat.component.html
+++ b/apps/shared-components/discussion-personal-chat/discussion-personal-chat.component.html
@@ -23,22 +23,21 @@ <h4>Be the first one to message!</h4>
         </div>
       </div>
     </div>
+  </div>
+  <div class="send-message-form">
+    <commudle-editor
+      *ngIf="currentUser && !blocked"
+      [editable]="true"
+      [placeholder]="'Type Here'"
+      [status]="'info'"
+      [appearance]="'filled'"
+      (contentChange)="sendMessage($event)"
+      [validators]="validators"
+    ></commudle-editor>
+    <p *ngIf="currentUser && blocked" class="blocked-text">You have blocked this User</p>
 
-    <div class="send-message-form">
-      <commudle-editor
-        *ngIf="currentUser && !blocked"
-        [editable]="true"
-        [placeholder]="'Type Here'"
-        [status]="'info'"
-        [appearance]="'filled'"
-        (contentChange)="sendMessage($event)"
-        [validators]="validators"
-      ></commudle-editor>
-      <p *ngIf="currentUser && blocked" class="blocked-text">You have blocked this User</p>
-
-      <button *ngIf="!currentUser" nbButton fullWidth status="primary" class="login-button" (click)="login()">
-        Post a Message
-      </button>
-    </div>
+    <button *ngIf="!currentUser" nbButton fullWidth status="primary" class="login-button" (click)="login()">
+      Post a Message
+    </button>
   </div>
 </div>
diff --git a/apps/shared-components/discussion-personal-chat/discussion-personal-chat.component.scss b/apps/shared-components/discussion-personal-chat/discussion-personal-chat.component.scss
index 03acdcdb79..ad524a58b9 100644
--- a/apps/shared-components/discussion-personal-chat/discussion-personal-chat.component.scss
+++ b/apps/shared-components/discussion-personal-chat/discussion-personal-chat.component.scss
@@ -1,11 +1,11 @@
 :host {
-  @apply com-h-full;
+  @apply com-flex com-min-h-0 com-flex-col com-flex-grow;
 
   .discussion-chat-component {
-    @apply com-h-full com-relative;
+    @apply com-flex-grow com-min-h-0 com-flex com-flex-col com-relative;
 
     .messages {
-      @apply com-h-full;
+      @apply com-min-h-0 com-flex-grow com-overflow-y-auto;
 
       .message {
         @apply com-p-0 com-px-3;
@@ -22,7 +22,7 @@
     }
 
     .send-message-form {
-      @apply com-bg-white com-sticky com-bottom-0 com-w-full;
+      @apply com-bg-white com-shrink-0 com-sticky com-bottom-0 com-w-full;
 
       form {
         align-items: self-start;