diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index c43d85b1b..af99c0c2b 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -161,6 +161,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 9e4b92dda..7f4ad1764 100644
--- a/deluge/ui/gtkui/peers_tab.py
+++ b/deluge/ui/gtkui/peers_tab.py
@@ -161,6 +161,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)