diff --git a/op/op.Search.php b/op/op.Search.php
index c03cc4fdb..6abc65502 100644
--- a/op/op.Search.php
+++ b/op/op.Search.php
@@ -195,6 +195,9 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
 	 * are found
 	 */
 	$resultmode = 0x03;
+	if (isset($_GET["resultmode"]) && is_numeric($_GET["resultmode"])) {
+			$resultmode = $_GET['resultmode'];
+	}
 
 	$mode = "AND";
 	if (isset($_GET["mode"]) && is_numeric($_GET["mode"]) && $_GET["mode"]==0) {
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 49d41af5a..b1bc209fc 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -143,6 +143,16 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 </td>
 </tr>
 <tr>
+<td><?php printMLText("search_resultmode");?>:</td>
+<td>
+<select name="resultmode">
+<option value="3" <?php echo ($resultmode=='3') ? "selected" : ""; ?>><?php printMLText("search_resultmode_both");?>
+<option value="2"<?php echo ($resultmode=='2') ? "selected" : ""; ?>><?php printMLText("search_mode_folders");?>
+<option value="1"<?php echo ($resultmode=='1') ? "selected" : ""; ?>><?php printMLText("search_mode_documents");?>
+</select>
+</td>
+</tr>
+<tr>
 <td><?php printMLText("under_folder")?>:</td>
 <td><?php $this->printFolderChooser("form1", M_READ, -1, $startfolder);?></td>
 </tr>