diff --git a/main/document/document.php b/main/document/document.php
index b9a9c5862c..e0e69fd1a5 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -1560,8 +1560,9 @@ if (isset($_GET['curdirpath']) &&
     }
 }
 
+$disableSearch = api_get_configuration_value('disable_search_documents');
 /* GET ALL DOCUMENT DATA FOR CURDIRPATH */
-if (isset($_GET['keyword']) && !empty($_GET['keyword'])) {
+if (isset($_GET['keyword']) && !empty($_GET['keyword']) && false === $disableSearch) {
     $documentAndFolders = DocumentManager::getAllDocumentData(
         $courseInfo,
         $curdirpath,
@@ -1777,8 +1778,7 @@ if ($isAllowedToEdit && !$is_certificate_mode) {
     );
 }
 
-if (!$is_certificate_mode) {
-    /* BUILD SEARCH FORM */
+if (!$is_certificate_mode && false === $disableSearch) {
     $form = new FormValidator(
         'search_document',
         'get',
@@ -1975,7 +1975,7 @@ if (!empty($documentAndFolders)) {
                 $countedPaths[$document_data['path']] = true;
             }
 
-            if ((isset($_GET['keyword']) && DocumentManager::search_keyword($document_name, $_GET['keyword'])) ||
+            if ((isset($_GET['keyword']) && DocumentManager::searchKeyword($document_name, $_GET['keyword'])) ||
                 !isset($_GET['keyword']) ||
                 empty($_GET['keyword'])
             ) {
diff --git a/main/inc/lib/document.lib.php b/main/inc/lib/document.lib.php
index 345ad94ab9..4a7f4316ad 100644
--- a/main/inc/lib/document.lib.php
+++ b/main/inc/lib/document.lib.php
@@ -5936,9 +5936,9 @@ class DocumentManager
      *
      * @return bool Return true when exist
      */
-    public static function search_keyword($document_name, $keyword)
+    public static function searchKeyword($name, $keyword)
     {
-        if (api_strripos($document_name, $keyword) !== false) {
+        if (api_strripos($name, $keyword) !== false) {
             return true;
         }
 
diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
index a22f47571c..d11a0fa02e 100755
--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@@ -1557,6 +1557,9 @@ $_configuration['auth_password_links'] = [
 // Disable slideshow documents
 //$_configuration['disable_slideshow_documents'] = false;
 
+// Disable search documents
+//$_configuration['disable_search_documents'] = false;
+
 // KEEP THIS AT THE END
 // -------- Custom DB changes
 // Add user activation by confirmation email