diff --git a/ChangeLog b/ChangeLog
index f66f68df1..e2db40172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
   * Fix showing non-utf8 encoded torrents in add torrent dialog -- this adds
     an additional dependency on chardet.
   * Fix exception when timing out trying to send notification email
+  * Set some sane defaults for peers/file tabs column widths
 
 ==== WebUI ====
   * Fix starting when -l option is used
diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index e2185d111..28b224014 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -32,9 +32,6 @@
 #    statement from all source files in the program, then also delete it here.
 #
 
-#
-
-
 import gtk, gtk.glade
 import gobject
 import gettext
@@ -122,7 +119,7 @@ class FilesTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(200)
         column.set_reorderable(True)
         self.listview.append_column(column)
 
@@ -135,7 +132,7 @@ class FilesTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(50)
         column.set_reorderable(True)
         self.listview.append_column(column)
 
@@ -148,7 +145,7 @@ class FilesTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(100)
         column.set_reorderable(True)
         self.listview.append_column(column)
 
@@ -164,7 +161,7 @@ class FilesTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(100)
         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 cd07e978c..2baf7b354 100644
--- a/deluge/ui/gtkui/peers_tab.py
+++ b/deluge/ui/gtkui/peers_tab.py
@@ -32,9 +32,6 @@
 #    statement from all source files in the program, then also delete it here.
 #
 
-#
-
-
 import gtk, gtk.glade
 import os.path
 import cPickle
@@ -91,7 +88,7 @@ class PeersTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(20)
         column.set_reorderable(True)
         self.listview.append_column(column)
 
@@ -107,7 +104,7 @@ class PeersTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(100)
         column.set_reorderable(True)
         self.listview.append_column(column)
 
@@ -120,7 +117,7 @@ class PeersTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(100)
         column.set_reorderable(True)
         self.listview.append_column(column)
 
@@ -133,7 +130,7 @@ class PeersTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(100)
         column.set_reorderable(True)
         self.listview.append_column(column)
 
@@ -146,7 +143,7 @@ class PeersTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(50)
         column.set_reorderable(True)
         self.listview.append_column(column)
 
@@ -159,7 +156,7 @@ class PeersTab(Tab):
         column.set_clickable(True)
         column.set_resizable(True)
         column.set_expand(False)
-        column.set_min_width(10)
+        column.set_min_width(50)
         column.set_reorderable(True)
         self.listview.append_column(column)