diff --git a/onionshare_gui/file_selection.py b/onionshare_gui/file_selection.py
index 0ba94b51..22f9be09 100644
--- a/onionshare_gui/file_selection.py
+++ b/onionshare_gui/file_selection.py
@@ -205,16 +205,16 @@ class FileList(QtWidgets.QListWidget):
                 self.takeItem(itemrow)
                 self.files_updated.emit()
 
-            item_button = QtWidgets.QPushButton()
-            item_button.setDefault(False)
-            item_button.setFlat(True)
-            item_button.setIcon( QtGui.QIcon(common.get_resource_path('images/file_delete.png')) )
-            item_button.clicked.connect(delete_item)
+            item.item_button = QtWidgets.QPushButton()
+            item.item_button.setDefault(False)
+            item.item_button.setFlat(True)
+            item.item_button.setIcon( QtGui.QIcon(common.get_resource_path('images/file_delete.png')) )
+            item.item_button.clicked.connect(delete_item)
 
             # Create an item widget to display on the item
             item_widget_layout = QtWidgets.QHBoxLayout()
             item_widget_layout.addStretch()
-            item_widget_layout.addWidget(item_button)
+            item_widget_layout.addWidget(item.item_button)
             item_widget = QtWidgets.QWidget()
             item_widget.setLayout(item_widget_layout)
 
diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py
index 1aff79f4..78f171d0 100644
--- a/onionshare_gui/server_status.py
+++ b/onionshare_gui/server_status.py
@@ -182,6 +182,14 @@ class ServerStatus(QtWidgets.QWidget):
             self.copy_url_button.hide()
             self.copy_hidservauth_button.hide()
 
+        # Hide the FileList delete buttons when a share is running
+        if self.status == self.STATUS_STARTED or self.status == self.STATUS_WORKING:
+            for index in range(self.file_selection.file_list.count()):
+                self.file_selection.file_list.item(index).item_button.hide()
+        else:
+            for index in range(self.file_selection.file_list.count()):
+                self.file_selection.file_list.item(index).item_button.show()
+
         # Button
         button_stopped_style = 'QPushButton { background-color: #5fa416; color: #ffffff; padding: 10px; border: 0; border-radius: 5px; }'
         button_working_style = 'QPushButton { background-color: #4c8211; color: #ffffff; padding: 10px; border: 0; border-radius: 5px; font-style: italic; }'