diff --git a/public/index.js b/public/index.js
index e6b8fa6..1f0b697 100644
--- a/public/index.js
+++ b/public/index.js
@@ -19,6 +19,11 @@
   var paginator = document.querySelector('.pages')
   var pageNumText = document.querySelector('.pages #pagenum')
 
+  // Search saves
+  var searching = false
+  var pagePrev = 0
+  var pagesPrev = 0
+
   window.mobilecheck = function() {
     var check = false;
     (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||window.opera);
@@ -95,7 +100,7 @@
   }
 
   function updatePaging () {
-    if (input.value.trim() === '') {
+    if (pages > 1) {
       paginator.style.display = 'flex'
     } else {
       paginator.style.display = 'none'
@@ -106,10 +111,33 @@
   }
 
   function showTracks (page) {
+    let query = input.value
+    if (searching && query.trim() === '') {
+      searching = false
+      pagePrev = 0
+      pages = pagesPrev
+    }
+
     if (page > pages) return
     if (page < 1) return
+    updatePaging()
 
-    httpGet('/api/tracks?page=' + page).then(function (data) {
+    if (query.trim() === '') {
+      return httpGet('/api/tracks?page=' + page).then(function (data) {
+        pageNum = page
+        pages = data.pageCount
+        constructList(data.tracks)
+        updatePaging()
+      })
+    }
+
+    if (!searching) {
+      pagePrev = pageNum
+      pagesPrev = pages
+      searching = true
+    }
+
+    httpGet('/api/tracks/search?q=' + query + '&page=' + page).then(function (data) {
       pageNum = page
       pages = data.pageCount
       constructList(data.tracks)
@@ -117,18 +145,6 @@
     })
   }
 
-  function search (query) {
-    updatePaging()
-
-    if (query.trim() === '') {
-      return showTracks(pageNum)
-    }
-
-    httpGet('/api/tracks/search?string=' + query).then(function (data) {
-      constructList(data)
-    })
-  }
-
   function play (id) {
     if (id < 1) return
     httpGet('/api/track/' + id).then(function (data) {
@@ -146,7 +162,7 @@
   }
 
   input.addEventListener('keyup', function (e) {
-    e.which === 13 && search(input.value)
+    e.which === 13 && showTracks(input.value.trim() === '' ? (pagePrev !== 0 ? pagePrev : 1) : 1)
   }, false)
 
   audio.addEventListener('ended', function (e) {
diff --git a/server.js b/server.js
index c4d2ee1..19ef515 100755
--- a/server.js
+++ b/server.js
@@ -45,7 +45,7 @@ router.get('/tracks', async (req, res) => {
 
 let srchcategories = ['title', 'artist', 'album']
 router.get('/tracks/search', async (req, res) => {
-  let query = req.query.string
+  let query = req.query.q
   let qr = ''
   let exact = false
 
@@ -73,14 +73,28 @@ router.get('/tracks/search', async (req, res) => {
 
   if (!exact) query = `%${query}%`
 
+  // Paging
+  let page = parseInt(req.query.page) || 1
+  if (isNaN(page)) {
+    page = 1
+  }
+
   let db = await dbPromise
-  let tracks = await db.all(`SELECT * FROM Track WHERE ${qr} LIKE ? LIMIT 100`, query)
+  let count = (await db.get(`SELECT COUNT(*) FROM Track WHERE ${qr} LIKE ?`, query))['COUNT(*)']
+  let pageCount = Math.ceil(count / tracksPerPage)
+
+  if (page > pageCount) page = pageCount
+
+  let offset = (page - 1) * tracksPerPage
+  let tracks = await db.all(`SELECT * FROM Track WHERE ${qr} LIKE ? LIMIT ? OFFSET ?`, query, tracksPerPage, offset)
 
   for (let i in tracks) {
     delete tracks[i].file
   }
 
-  res.jsonp(tracks)
+  res.jsonp({
+    page, count, pageCount, tracks
+  })
 })
 
 router.get('/track/:id', async (req, res, next) => {