diff --git a/services/web/public/coffee/main/learn.coffee b/services/web/public/coffee/main/learn.coffee
index 28026be508..eeae4219b8 100644
--- a/services/web/public/coffee/main/learn.coffee
+++ b/services/web/public/coffee/main/learn.coffee
@@ -1,15 +1,9 @@
 define [
 	"base"
+	"services/algolia-search"
 ], (App) ->
-	
-	App.factory "algoliawiki", ->
-		if window.sharelatex?.algolia? and window.sharelatex.algolia?.indexes?.wiki?
-			client = new AlgoliaSearch(window.sharelatex.algolia?.app_id, window.sharelatex.algolia?.api_key)
-			index = client.initIndex(window.sharelatex.algolia?.indexes?.wiki)
-			return index
 
-	App.controller "SearchWikiController", ($scope, algoliawiki, _, $modal) ->
-		algolia = algoliawiki
+	App.controller "SearchWikiController", ($scope, algoliaSearch, _, $modal) ->
 		$scope.hits = []
 
 		$scope.clearSearchText = ->
@@ -54,7 +48,7 @@ define [
 				updateHits []
 				return
 				
-			algolia.search query, (err, response)->
+			algoliaSearch.searchWiki query, (err, response)->
 				if response.hits.length == 0
 					updateHits []
 				else
diff --git a/services/web/public/coffee/main/templates.coffee b/services/web/public/coffee/main/templates.coffee
index 3d05d4ea0f..45919d623a 100644
--- a/services/web/public/coffee/main/templates.coffee
+++ b/services/web/public/coffee/main/templates.coffee
@@ -1,15 +1,9 @@
 define [
 	"base"
+	"services/algolia-search"
 ], (App) ->
-	
-	App.factory "algoliawiki", ->
-		if window.sharelatex?.algolia? and window.sharelatex.algolia?.indexes?.wiki?
-			client = new AlgoliaSearch(window.sharelatex.algolia?.app_id, window.sharelatex.algolia?.api_key)
-			index = client.initIndex(window.sharelatex.algolia?.indexes?.wiki)
-			return index
 
-	App.controller "SearchWikiController", ($scope, algoliawiki, _) ->
-		algolia = algoliawiki
+	App.controller "SearchWikiController", ($scope, algoliaSearch, _) ->
 		$scope.hits = []
 
 		$scope.clearSearchText = ->
@@ -54,7 +48,7 @@ define [
 				updateHits []
 				return
 
-			algolia.search query, (err, response)->
+			algoliaSearch.searchWiki query, (err, response)->
 				if response.hits.length == 0
 					updateHits []
 				else