diff --git a/onionshare_gui/mode.py b/onionshare_gui/mode.py
index 6da83318..bd247568 100644
--- a/onionshare_gui/mode.py
+++ b/onionshare_gui/mode.py
@@ -36,7 +36,7 @@ class Mode(QtWidgets.QWidget):
     starting_server_step3 = QtCore.pyqtSignal()
     starting_server_error = QtCore.pyqtSignal(str)
     set_server_active = QtCore.pyqtSignal(bool)
-    adjust_size = QtCore.pyqtSignal()
+    adjust_size = QtCore.pyqtSignal(int)
 
     def __init__(self, common, qtapp, app, status_bar, server_status_label, system_tray, filenames=None, local_only=False):
         super(Mode, self).__init__()
@@ -332,3 +332,22 @@ class Mode(QtWidgets.QWidget):
         Handle REQUEST_UPLOAD_FINISHED event.
         """
         pass
+
+    def resize_window(self):
+        """
+        We call this to force the OnionShare window to resize itself to be smaller.
+        For this to do anything, the Mode needs to override it and call:
+
+        self.adjust_size.emit(min_width)
+
+        It can calculate min_width (the new minimum window width) based on what
+        widgets are visible.
+        """
+        pass
+
+    def show(self):
+        """
+        Always resize the window after showing this Mode widget.
+        """
+        super(Mode, self).show()
+        self.resize_window()
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index 5469c57c..e2d95dab 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -168,6 +168,9 @@ class OnionShareGui(QtWidgets.QMainWindow):
         self.setCentralWidget(central_widget)
         self.show()
 
+        # Adjust window size, to start with a minimum window width
+        self.adjust_size(450)
+
         # The server isn't active yet
         self.set_server_active(False)
 
@@ -444,10 +447,14 @@ class OnionShareGui(QtWidgets.QMainWindow):
         # Disable settings menu action when server is active
         self.settings_action.setEnabled(not active)
 
-    def adjust_size(self):
+    def adjust_size(self, min_width):
         """
-        Recursively adjust size on all widgets
+        Recursively adjust size on all widgets. min_width is the new minimum width
+        of the window.
         """
+        self.common.log("OnionShareGui", "adjust_size", "min_width={}".format(min_width))
+        self.setMinimumWidth(min_width)
+
         # Recursively adjust sizes for the modes
         def adjust_size_layout(layout):
             count = layout.count()
@@ -465,8 +472,6 @@ class OnionShareGui(QtWidgets.QMainWindow):
             layout = widget.layout()
             if layout:
                 adjust_size_layout(layout)
-            # Processing Qt events before adjusting size makes each .adjustSize() actually count
-            self.qtapp.processEvents()
             widget.adjustSize()
 
         # Adjust sizes of each mode
@@ -474,6 +479,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
             adjust_size_widget(mode)
 
         # Adjust window size
+        self.qtapp.processEvents()
         self.adjustSize()
 
     def closeEvent(self, e):
diff --git a/onionshare_gui/receive_mode/__init__.py b/onionshare_gui/receive_mode/__init__.py
index dab37ef2..e30ef519 100644
--- a/onionshare_gui/receive_mode/__init__.py
+++ b/onionshare_gui/receive_mode/__init__.py
@@ -235,7 +235,7 @@ class ReceiveMode(Mode):
             self.info_widget.hide()
 
         # Resize window
-        self.adjust_size.emit()
+        self.resize_window()
 
     def toggle_uploads(self):
         """
@@ -252,4 +252,10 @@ class ReceiveMode(Mode):
             self.info_toggle_button.setIcon( QtGui.QIcon(self.common.get_resource_path('images/uploads_toggle_selected.png')) )
             self.info_toggle_button.setFlat(False)
 
-        self.adjust_size.emit()
+        self.resize_window()
+
+    def resize_window(self):
+        min_width = 450
+        if self.uploads.isVisible():
+            min_width += 300
+        self.adjust_size.emit(min_width)
diff --git a/onionshare_gui/share_mode/__init__.py b/onionshare_gui/share_mode/__init__.py
index c0cb6d39..cc0a9f32 100644
--- a/onionshare_gui/share_mode/__init__.py
+++ b/onionshare_gui/share_mode/__init__.py
@@ -330,7 +330,7 @@ class ShareMode(Mode):
             self.info_widget.hide()
 
         # Resize window
-        self.adjust_size.emit()
+        self.resize_window()
 
     def reset_info_counters(self):
         """
@@ -379,7 +379,13 @@ class ShareMode(Mode):
             self.info_toggle_button.setIcon( QtGui.QIcon(self.common.get_resource_path('images/downloads_toggle_selected.png')) )
             self.info_toggle_button.setFlat(False)
 
-        self.adjust_size.emit()
+        self.resize_window()
+
+    def resize_window(self):
+        min_width = 450
+        if self.downloads.isVisible():
+            min_width += 300
+        self.adjust_size.emit(min_width)
 
     @staticmethod
     def _compute_total_size(filenames):