diff --git a/onionshare_gui/tab/mode/receive_mode/__init__.py b/onionshare_gui/tab/mode/receive_mode/__init__.py
index d7b31756..498ca2aa 100644
--- a/onionshare_gui/tab/mode/receive_mode/__init__.py
+++ b/onionshare_gui/tab/mode/receive_mode/__init__.py
@@ -106,17 +106,21 @@ class ReceiveMode(Mode):
 
         # Main layout
         self.main_layout = QtWidgets.QVBoxLayout()
-        self.main_layout.addWidget(self.header)
         self.main_layout.addLayout(top_bar_layout)
         self.main_layout.addWidget(receive_warning)
         self.main_layout.addWidget(self.primary_action)
         self.main_layout.addStretch()
         self.main_layout.addWidget(self.min_width_widget)
 
+        # Column layout
+        self.column_layout = QtWidgets.QHBoxLayout()
+        self.column_layout.addLayout(self.main_layout)
+        self.column_layout.addWidget(self.history, stretch=1)
+
         # Wrapper layout
-        self.wrapper_layout = QtWidgets.QHBoxLayout()
-        self.wrapper_layout.addLayout(self.main_layout)
-        self.wrapper_layout.addWidget(self.history, stretch=1)
+        self.wrapper_layout = QtWidgets.QVBoxLayout()
+        self.wrapper_layout.addWidget(self.header)
+        self.wrapper_layout.addLayout(self.column_layout)
         self.setLayout(self.wrapper_layout)
 
     def data_dir_button_clicked(self):
diff --git a/onionshare_gui/tab/mode/share_mode/__init__.py b/onionshare_gui/tab/mode/share_mode/__init__.py
index 70187d99..71db2a50 100644
--- a/onionshare_gui/tab/mode/share_mode/__init__.py
+++ b/onionshare_gui/tab/mode/share_mode/__init__.py
@@ -130,16 +130,20 @@ class ShareMode(Mode):
 
         # Main layout
         self.main_layout = QtWidgets.QVBoxLayout()
-        self.main_layout.addWidget(self.header)
         self.main_layout.addLayout(top_bar_layout)
         self.main_layout.addLayout(self.file_selection)
         self.main_layout.addWidget(self.primary_action)
         self.main_layout.addWidget(self.min_width_widget)
 
+        # Column layout
+        self.column_layout = QtWidgets.QHBoxLayout()
+        self.column_layout.addLayout(self.main_layout)
+        self.column_layout.addWidget(self.history, stretch=1)
+
         # Wrapper layout
-        self.wrapper_layout = QtWidgets.QHBoxLayout()
-        self.wrapper_layout.addLayout(self.main_layout)
-        self.wrapper_layout.addWidget(self.history, stretch=1)
+        self.wrapper_layout = QtWidgets.QVBoxLayout()
+        self.wrapper_layout.addWidget(self.header)
+        self.wrapper_layout.addLayout(self.column_layout)
         self.setLayout(self.wrapper_layout)
 
         # Always start with focus on file selection
diff --git a/onionshare_gui/tab/mode/website_mode/__init__.py b/onionshare_gui/tab/mode/website_mode/__init__.py
index af5f9060..179a5d05 100644
--- a/onionshare_gui/tab/mode/website_mode/__init__.py
+++ b/onionshare_gui/tab/mode/website_mode/__init__.py
@@ -130,16 +130,20 @@ class WebsiteMode(Mode):
 
         # Main layout
         self.main_layout = QtWidgets.QVBoxLayout()
-        self.main_layout.addWidget(self.header)
         self.main_layout.addLayout(top_bar_layout)
         self.main_layout.addLayout(self.file_selection)
         self.main_layout.addWidget(self.primary_action)
         self.main_layout.addWidget(self.min_width_widget)
 
+        # Column layout
+        self.column_layout = QtWidgets.QHBoxLayout()
+        self.column_layout.addLayout(self.main_layout)
+        self.column_layout.addWidget(self.history, stretch=1)
+
         # Wrapper layout
-        self.wrapper_layout = QtWidgets.QHBoxLayout()
-        self.wrapper_layout.addLayout(self.main_layout)
-        self.wrapper_layout.addWidget(self.history, stretch=1)
+        self.wrapper_layout = QtWidgets.QVBoxLayout()
+        self.wrapper_layout.addWidget(self.header)
+        self.wrapper_layout.addLayout(self.column_layout)
         self.setLayout(self.wrapper_layout)
 
         # Always start with focus on file selection