diff --git a/background.js b/background.js
index e410d0e..1264171 100644
--- a/background.js
+++ b/background.js
@@ -33,6 +33,7 @@ chrome.pageAction.onClicked.addListener(function(tab) {
 	getCurrentTabUrl(function(url) {
 		var betterUrl = getBetterUrl(url);
 		var filename = betterUrl.substr(betterUrl.lastIndexOf("/"));
+		filename = filename.substr(0, filename.indexOf('?'));
 
 		chrome.storage.sync.get({url: '', tabbehaviour: '', copytoclipboard: false, replacebookmark: false}, function(config) {
 			if(config.url == '') {
@@ -86,6 +87,7 @@ function isCoolUrl(url) {
 
 	var extensionIndex = url.lastIndexOf('.');
 	var extension = url.substr(extensionIndex + 1);
+	extension = extension.substr(0, extension.indexOf('?'));
 
 	var validExtensions = ["jpg", "jpeg", "png", "gif", "webm", "gifv", "mp4", "mp3", "ogg", "opus"];