diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index 1fc0ccba8..b985ff125 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -164,6 +164,8 @@ class FilesTab(Tab):
         column.set_resizable(True)
         column.set_expand(False)
         column.set_min_width(100)
+        # Bugfix: Last column needs max_width set to stop scrollbar appearing
+        column.set_max_width(200)
         column.set_reorderable(True)
         self.listview.append_column(column)
 
diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py
index 9ac5a6de9..20cdfbfad 100644
--- a/deluge/ui/gtkui/peers_tab.py
+++ b/deluge/ui/gtkui/peers_tab.py
@@ -164,6 +164,8 @@ class PeersTab(Tab):
         column.set_resizable(True)
         column.set_expand(False)
         column.set_min_width(50)
+        # Bugfix: Last column needs max_width set to stop scrollbar appearing
+        column.set_max_width(150)
         column.set_reorderable(True)
         self.listview.append_column(column)