diff --git a/data/ui/channel_inner_window.ui b/data/ui/channel_inner_window.ui
index 6ec779129f112d7cc3160913ffd7a3a7d0186db1..96531201f33e061a9b65aade9d73914407a566c1 100644
--- a/data/ui/channel_inner_window.ui
+++ b/data/ui/channel_inner_window.ui
@@ -14,7 +14,6 @@
       <child>
         <object class="HdyHeaderBar" id="_context_headerbar">
           <property name="visible">True</property>
-          <property name="show-close-button">True</property>
           <child>
             <object class="GtkButton" id="_flap_toggle_button">
               <property name="visible">False</property>
@@ -83,6 +82,52 @@
               <property name="pack-type">end</property>
             </packing>
           </child>
+          <child>
+            <!-- Creating a custom fake close button so that we would be able to-->
+            <!-- change what happens when you click it, to handle poping in. -->
+            <!-- I tried to copy the defeault close button's hierarchy and style classes -->
+            <!-- however I still needed to add some margin-left for some reason -->
+            <!-- Breaks configuration of how many close buttons to show, etc -->
+            <object class="GtkBox">
+              <property name="visible">True</property>
+              <child>
+                <object class="GtkSeparator">
+                  <property name="visible">True</property>
+                  <property name="orientation">vertical</property>
+                  <style>
+                    <class name="titlebutton"/>
+                  </style>
+                </object>
+              </child>
+              <child>
+                <object class="GtkButton">
+                  <property name="visible">True</property>
+                  <property name="valign">GTK_ALIGN_CENTER</property>
+                  <property name="margin-left">5</property>
+                  <signal name="clicked" handler="_on_close_button_clicked"/>
+                  <child>
+                    <object class="GtkImage">
+                      <property name="visible">True</property>
+                      <property name="icon-name">window-close-symbolic</property>
+                    </object>
+                  </child>
+                  <style>
+                    <class name="titlebutton"/>
+                    <class name="close"/>
+                  </style>
+                </object>
+              </child>
+              <style>
+                <class name="right"/>
+                <class name="horizontal"/>
+              </style>
+            </object>
+            <packing>
+              <property name="pack-type">end</property>
+              <!-- Needed for some reason -->
+              <property name="position">2</property>
+            </packing>
+          </child>
         </object>
       </child>
       <child>
diff --git a/src/channel_inner_window.py b/src/channel_inner_window.py
index c0131d79e66ae65b344767a226294a5de7eed316..56d6eb54e427055dce16d512d47594bafd435cda 100644
--- a/src/channel_inner_window.py
+++ b/src/channel_inner_window.py
@@ -290,6 +290,14 @@ class ChannelInnerWindow(Gtk.Box):
         """
         return self._msg_sending_scrl_mode_en
 
+    @Gtk.Template.Callback()
+    def _on_close_button_clicked(self, button):
+        window = self.get_toplevel()
+        if window.is_toplevel():
+            if self.is_poped:
+                self.popin()
+            window.destroy()
+
     @Gtk.Template.Callback()
     def _on_popout_context_button_clicked(self, button):
         self.popout()