diff --git a/lib/doc/browse/index.html b/lib/doc/browse/index.html
index 78501ba52..c6c9c7ce6 100644
--- a/lib/doc/browse/index.html
+++ b/lib/doc/browse/index.html
@@ -158,7 +158,7 @@
       </header>
 
       <footer id="footer">
-        John J. Camilleri<br/><em>Updated 2013-07-23</em>
+        John J. Camilleri<br/><em>Updated 2014-01-29</em>
       </footer>
     </div><!-- ui-layout-north -->
 
@@ -168,4 +168,4 @@
     </div><!-- ui-layout-west -->
 
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/lib/doc/browse/script.js b/lib/doc/browse/script.js
index beb153a5b..9c1660d67 100644
--- a/lib/doc/browse/script.js
+++ b/lib/doc/browse/script.js
@@ -216,6 +216,20 @@ function Thing() {
             }
             t.setLanguage("english");
 
+	    // Module search box
+            var module_search = $("<input>")
+                .attr('id', 'module_search')
+                .keyup(function(){
+                    t.searchModule($(this).val());
+                })
+                .appendTo("#languages");
+
+	    $("<a>")
+		.attr('href','#')
+		.click(t.clearSearchModule)
+		.html("Clear")
+                .appendTo("#languages");
+
             // Initialize API results
             t.initAPI();
 
@@ -251,6 +265,8 @@ function Thing() {
         t.state.current.set(lang, module);
         t.loadTagsFile(module);
         t.loadSourceFile(lang, module, lineNo);
+        if ($('.tab.api').hasClass('active'))
+	    t.showPanel("#scope");
     }
 
     // Load a tags file
@@ -382,6 +398,35 @@ function Thing() {
         t.hideLoading();
     }
 
+    // ===== Module search =====
+
+    this.searchModule = function(s) {
+	if (!s) {
+	    return t.clearSearchModule();
+	}
+	$('#language_select').hide();
+        $("#modules").empty();
+        for (var lang in t.state.index['languages']) {
+	    var modules = t.state.index['languages'][lang];
+	    for (var j in modules) {
+		var module = modules[j];
+		var full_module = lang+'/'+module;
+		if (!module) continue;
+		if (full_module.toLowerCase().indexOf(s.toLowerCase())==-1) continue;
+		$('<a>')
+		    .html(full_module)
+		    .attr('href', "#"+lang+"/"+module+".gf")
+		    .appendTo("#modules");
+	    }
+	}
+    };
+
+    this.clearSearchModule = function() {
+	$('#module_search').val('');
+	$('#language_select').show();
+	t.setLanguage(t.state.language);
+	return false;
+    };
 
     // ===== Filtering of scope info =====