diff --git a/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy b/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
index 5b237621..5b1b5ef7 100644
--- a/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
+++ b/gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
@@ -87,6 +87,10 @@ class OptionsController {
         model.shareHiddenFiles = shareHidden
         settings.shareHiddenFiles = shareHidden
 
+        boolean browseFiles = view.browseFilesCheckbox.model.isSelected()
+        model.browseFiles = browseFiles
+        settings.browseFiles = browseFiles
+        
         String downloadLocation = model.downloadLocation
         settings.downloadLocation = new File(downloadLocation)
 
diff --git a/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy b/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
index 66f32caa..7bf60ee4 100644
--- a/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
@@ -16,6 +16,7 @@ class OptionsModel {
     @Observable boolean shareHiddenFiles
     @Observable String downloadLocation
     @Observable boolean searchComments
+    @Observable boolean browseFiles
 
     // i2p options
     @Observable String inboundLength
@@ -56,6 +57,7 @@ class OptionsModel {
         shareHiddenFiles = settings.shareHiddenFiles
         downloadLocation = settings.downloadLocation.getAbsolutePath()
         searchComments = settings.searchComments
+        browseFiles = settings.browseFiles
 
         Core core = application.context.get("core")
         inboundLength = core.i2pOptions["inbound.length"]
diff --git a/gui/griffon-app/views/com/muwire/gui/BrowseView.groovy b/gui/griffon-app/views/com/muwire/gui/BrowseView.groovy
index bd2b4a62..3bd4ec7e 100644
--- a/gui/griffon-app/views/com/muwire/gui/BrowseView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/BrowseView.groovy
@@ -102,7 +102,7 @@ class BrowseView {
         controller.register()
         
         dialog.getContentPane().add(p)
-        dialog.pack()
+        dialog.setSize(700, 400)
         dialog.setLocationRelativeTo(mainFrame)
         dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE)
         dialog.addWindowListener( new WindowAdapter() {
diff --git a/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy b/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
index 8f2ee6c5..ea8fd1a7 100644
--- a/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/OptionsView.groovy
@@ -38,6 +38,7 @@ class OptionsView {
     def shareDownloadedCheckbox
     def shareHiddenCheckbox
     def searchCommentsCheckbox
+    def browseFilesCheckbox
 
     def inboundLengthField
     def inboundQuantityField
@@ -92,10 +93,13 @@ class OptionsView {
             
             label(text : "Share hidden files", constraints : gbc(gridx : 0, gridy:5))
             shareHiddenCheckbox = checkBox(selected : bind {model.shareHiddenFiles}, constraints : gbc(gridx :1, gridy:5))
+            
+            label(text : "Allow browsing", constraints : gbc(gridx : 0, gridy : 6))
+            browseFilesCheckbox = checkBox(selected : bind {model.browseFiles}, constraints : gbc(gridx : 1, gridy : 6))
 
-            label(text : "Save downloaded files to:", constraints: gbc(gridx:0, gridy:6))
-            button(text : "Choose", constraints : gbc(gridx : 1, gridy:6), downloadLocationAction)
-            label(text : bind {model.downloadLocation}, constraints: gbc(gridx:0, gridy:7, gridwidth:2))
+            label(text : "Save downloaded files to:", constraints: gbc(gridx:0, gridy:7))
+            button(text : "Choose", constraints : gbc(gridx : 1, gridy:7), downloadLocationAction)
+            label(text : bind {model.downloadLocation}, constraints: gbc(gridx:0, gridy:8, gridwidth:2))
 
         }
         i = builder.panel {