diff --git a/js/bookmarks.js b/js/bookmarks.js
index a4673c55..189765e2 100644
--- a/js/bookmarks.js
+++ b/js/bookmarks.js
@@ -3,19 +3,11 @@ var bookmarks_loading = false;
 var dialog;
 var bookmarks_sorting = 'bookmarks_sorting_recent';
 
-var bookmark_view = 'image';
-
 $(document).ready(function() {
 	watchUrlField();
-	
 	$('#bm_import').change(attachSettingEvent);
 	$('#add_url').on('keydown keyup change click', watchUrlField);
-  $('#settingsbtn').on('click keydown', function() {
-		if( $('#bookmark_settings').hasClass('open'))
-			$('#bookmark_settings').switchClass( "open", "" );
-		else
-			$('#bookmark_settings').switchClass( "", "open");
-	});
+  $('#settingsbtn').on('click keydown', toggleSettings);
 	$('#bm_export').click(exportBm);
 
 	$(window).resize(function () {
@@ -44,6 +36,21 @@ var formatString = (function() {
 	};
 })();
 
+function watchClickInSetting(e){
+	if($('#bookmark_settings').find($(e.target)).length == 0){
+		toggleSettings();
+	}
+}
+function toggleSettings() {
+	if( $('#bookmark_settings').hasClass('open')) { //Close
+		$('#bookmark_settings').switchClass( "open", "" );
+		$('body').unbind('click');
+	}
+	else {		
+		$('#bookmark_settings').switchClass( "", "open");
+		$('body').bind('click',watchClickInSetting);
+	}
+}
 function addFilterTag(event) {
 	event.preventDefault();
 	$('#tag_filter input').tagit('createTag', $(this).text());
diff --git a/templates/list.php b/templates/list.php
index f0c5ae2f..ae8b2df9 100644
--- a/templates/list.php
+++ b/templates/list.php
@@ -25,7 +25,7 @@
 	</ul>
 
 
-<div id="bookmark_settings">
+<div id="bookmark_settings" class="">
 	<ul class="controls">
 		<li style="float: right">
 			<button id="settingsbtn" title="<?php echo $l->t('Settings'); ?>">
diff --git a/templates/settings.php b/templates/settings.php
index 1af87301..26bad6c8 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -30,7 +30,7 @@
 
 			<legend><strong><?php echo $l->t('Export & Import');?></strong></legend>
 			<input type="button" id="bm_export" href="<?php echo OCP\Util::linkTo('bookmarks', 'export.php') ;?>" value="<?php echo $l->t('Export'); ?>" />
-			<input type="file" id="bm_import" name="bm_import">
+			<input type="file" id="bm_import" name="bm_import" size="5">
 			<button type="button" name="bm_import_btn" id="bm_import_submit"><?php echo $l->t('Import'); ?></button>
 			<div id="upload"></div>