diff --git a/deluge/ui/web/js/deluge-all/preferences/PreferencesWindow.js b/deluge/ui/web/js/deluge-all/preferences/PreferencesWindow.js
index 5a911969b..102b41854 100644
--- a/deluge/ui/web/js/deluge-all/preferences/PreferencesWindow.js
+++ b/deluge/ui/web/js/deluge-all/preferences/PreferencesWindow.js
@@ -96,8 +96,8 @@ Deluge.preferences.PreferencesWindow = Ext.extend(Ext.Window, {
 			autoDestroy: false,
 			region: 'center',
 			layout: 'card',
-			//height: 400,
-			//autoScroll: true,
+			autoScroll: true,
+			width: 300,
 			margins: '5 5 5 5',
 			cmargins: '5 5 5 5'
 		});
@@ -159,7 +159,7 @@ Deluge.preferences.PreferencesWindow = Ext.extend(Ext.Window, {
 		var store = this.categoriesGrid.getStore();
 		var name = page.title;
 		store.add([new PreferencesRecord({name: name})]);
-		page['bodyStyle'] = 'margin: 5px';
+		page['bodyStyle'] = 'padding: 5px';
 		page.preferences = this;
 		this.pages[name] = this.configPanel.add(page);
 		return this.pages[name];
diff --git a/deluge/ui/web/js/ext-extensions/ToggleField.js b/deluge/ui/web/js/ext-extensions/ToggleField.js
index 7f4922d40..b3f1d359d 100644
--- a/deluge/ui/web/js/ext-extensions/ToggleField.js
+++ b/deluge/ui/web/js/ext-extensions/ToggleField.js
@@ -53,7 +53,7 @@ Ext.ux.form.ToggleField = Ext.extend(Ext.form.Field, {
 		this.panel.doLayout();
 
 		// we substract 10 for the padding :-)
-		var inputWidth = w - this.toggle.getSize().width - 10;
+		var inputWidth = w - this.toggle.getSize().width - 25;
 		this.input.setSize(inputWidth, h);
 	},