diff --git a/src/widgets/history-item.ui b/src/widgets/history-item.ui
index 6710bf8..203c89d 100644
--- a/src/widgets/history-item.ui
+++ b/src/widgets/history-item.ui
@@ -137,38 +137,37 @@
 
             <!-- Request Expander Separator -->
             <child>
-              <object class="GtkButton" id="request_expander">
+              <object class="GtkBox" id="request_expander">
+                <property name="orientation">horizontal</property>
+                <property name="spacing">6</property>
                 <property name="halign">fill</property>
                 <property name="margin-top">3</property>
-                <signal name="clicked" handler="on_request_expander_clicked" swapped="no"/>
+                <property name="margin-bottom">3</property>
+                <property name="cursor-name">pointer</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="orientation">horizontal</property>
-                    <property name="spacing">6</property>
-                    <property name="halign">center</property>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="hexpand">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="request_expander_label">
-                        <property name="label">Show full request</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="hexpand">True</property>
-                      </object>
-                    </child>
+                  <object class="GtkSeparator">
+                    <property name="hexpand">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="request_expander_label">
+                    <property name="label">Show full request</property>
+                    <style>
+                      <class name="dim-label"/>
+                      <class name="caption"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkSeparator">
+                    <property name="hexpand">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkGestureClick">
+                    <signal name="released" handler="on_request_expander_clicked" swapped="no"/>
                   </object>
                 </child>
-                <style>
-                  <class name="flat"/>
-                </style>
               </object>
             </child>
 
@@ -224,38 +223,37 @@
 
             <!-- Response Expander Separator -->
             <child>
-              <object class="GtkButton" id="response_expander">
+              <object class="GtkBox" id="response_expander">
+                <property name="orientation">horizontal</property>
+                <property name="spacing">6</property>
                 <property name="halign">fill</property>
                 <property name="margin-top">3</property>
-                <signal name="clicked" handler="on_response_expander_clicked" swapped="no"/>
+                <property name="margin-bottom">3</property>
+                <property name="cursor-name">pointer</property>
                 <child>
-                  <object class="GtkBox">
-                    <property name="orientation">horizontal</property>
-                    <property name="spacing">6</property>
-                    <property name="halign">center</property>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="hexpand">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="response_expander_label">
-                        <property name="label">Show full response</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="hexpand">True</property>
-                      </object>
-                    </child>
+                  <object class="GtkSeparator">
+                    <property name="hexpand">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="response_expander_label">
+                    <property name="label">Show full response</property>
+                    <style>
+                      <class name="dim-label"/>
+                      <class name="caption"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkSeparator">
+                    <property name="hexpand">True</property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkGestureClick">
+                    <signal name="released" handler="on_response_expander_clicked" swapped="no"/>
                   </object>
                 </child>
-                <style>
-                  <class name="flat"/>
-                </style>
               </object>
             </child>
 
diff --git a/src/widgets/history_item.py b/src/widgets/history_item.py
index 6c56c40..117c4e6 100644
--- a/src/widgets/history_item.py
+++ b/src/widgets/history_item.py
@@ -127,7 +127,7 @@ class HistoryItem(Gtk.Box):
         self.emit('load-requested')
 
     @Gtk.Template.Callback()
-    def on_request_expander_clicked(self, button):
+    def on_request_expander_clicked(self, gesture, n_press, x, y):
         """Toggle request body expansion."""
         print(f"DEBUG: Request expander clicked! Current state: {self.request_expanded}")
         self.request_expanded = not self.request_expanded
@@ -147,10 +147,8 @@ class HistoryItem(Gtk.Box):
             self.request_expander_label.set_text("Show full request")
             print("DEBUG: Collapsed request to 60px")
 
-        return True  # Consume the event
-
     @Gtk.Template.Callback()
-    def on_response_expander_clicked(self, button):
+    def on_response_expander_clicked(self, gesture, n_press, x, y):
         """Toggle response body expansion."""
         print(f"DEBUG: Response expander clicked! Current state: {self.response_expanded}")
         self.response_expanded = not self.response_expanded
@@ -170,8 +168,6 @@ class HistoryItem(Gtk.Box):
             self.response_expander_label.set_text("Show full response")
             print("DEBUG: Collapsed response to 60px")
 
-        return True  # Consume the event
-
     def toggle_expanded(self):
         """Toggle between collapsed and expanded view."""
         self.expanded = not self.expanded