diff --git a/archive/community.applications-2017.10.08.txz b/archive/community.applications-2017.10.08.txz
index 96499ca5..520e4e31 100644
Binary files a/archive/community.applications-2017.10.08.txz and b/archive/community.applications-2017.10.08.txz differ
diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page b/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page
index 51723285..35a43c3e 100644
--- a/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page
+++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/CommunityApps.page
@@ -613,7 +613,9 @@ function doSearch(button) {
 		return;
 	}
 	var sortOrder = getSortOrder();
-
+	if ( "<?=$cfg['dockerSearch']?>" == "yes" ) {
+		$('.dockerSearch').show();
+	}
 	myAlert("Searching...", "Searching for <strong><font color=red>"+filter+"</font></strong>","/plugins/community.applications/images/spinner2.gif","40x40");
 
 	$.post(URL,{action:'get_content',filter:filter,sortOrder:sortOrder,windowWidth:windowWidth,maxPerPage:maxPerPage},function(data) {
@@ -626,10 +628,6 @@ function doSearch(button) {
 			myCloseAlert();
 			setToolTip();
 		}
-
-		if ( "<?=$cfg['dockerSearch']?>" == "yes" ) {
-			$('.dockerSearch').show();
-		}
 	});
 }
 
diff --git a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
index 1fd2a914..4dcaf3f0 100644
--- a/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
+++ b/source/community.applications/usr/local/emhttp/plugins/community.applications/include/exec.php
@@ -701,7 +701,9 @@ function my_display_apps($viewMode,$file,$pageNumber=1,$officialFlag=false,$sele
 	if ( ! $officialFlag ) {
 		$ct .= "<br>".getPageNavigation($pageNumber,count($file),false)."<br><br><br>";
 	}
-
+  if ( $communitySettings['dockerSearch'] != "yes" ) {
+		$ct .= "<script>$('.dockerSearch').hide();</script>";
+	}
 	return $ct;
 }