diff --git a/src/main.rs b/src/main.rs
index 89e8fec..c8865f6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -74,7 +74,7 @@ async fn gif(req: HttpRequest) -> Result<HttpResponse, Error> {
         .finish();
 
     
-    let url = format!("https://g.tenor.com/v1/search?q={}&key={}&limit=20&media_filter=tinygif", name, TENOR_API_KEY.to_owned());
+    let url = format!("https://g.tenor.com/v1/search?q={}&key={}&limit=20&media_filter=tinygif", name.replace(" ", "+"), TENOR_API_KEY.to_owned());
     let response = client.get(url)
         .header("User-Agent", "actix-web/3.0")
         .send()     
diff --git a/static/js/app.js b/static/js/app.js
index fe70e76..ad80c31 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -325,7 +325,7 @@ function loadGif(query) {
         if(status == 'success') {
             data.results.forEach(function(result) {
                 var gif = result.media[0].tinygif.url;
-                area.append($('<button>', {class: 'button', onclick: 'sendGif("'+gif+'"); $("#gif_clip").addClass("is-hidden");'})
+                area.append($('<button>', {class: 'button', onclick: 'sendGif("'+encodeURI(gif)+'"); $("#gif_clip").addClass("is-hidden");'})
                     .append($('<img>', {src: gif})));
             });
         }