diff --git a/dpaste/templates/dpaste/base.html b/dpaste/templates/dpaste/base.html
index ec22962..f6b8a62 100644
--- a/dpaste/templates/dpaste/base.html
+++ b/dpaste/templates/dpaste/base.html
@@ -31,20 +31,26 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1/jquery.js"></script>
 <script src="{% static "dpaste/bootstrap/js/bootstrap.min.js" %}"></script>
 <script>
-jQuery(document).ready(function($) {
+jQuery(function($) {
+    var lexerReq;
     $('#guess_lexer_btn').click(function() {
-        $.getJSON('{% url "snippet_guess_lexer" %}',
-            {
-                codestring: $('#id_content').val()
-            },
-            function(data) {
-                if (data.lexer === 'unknown') {
-                    $('#guess_lexer_btn').css('color', 'red');
-                } else {
-                    $('#id_lexer').val(data.lexer);
-                    $('#guess_lexer_btn').css('color', 'inherit');
-                }
-            });
+        // Cancel previous request if it is still pending
+        if (lexerReq) {
+            lexerReq.abort();
+        }
+
+        lexerReq = $.getJSON('{% url "snippet_guess_lexer" %}', {
+            codestring: $('#id_content').val()
+        }).done(function(data) {
+            if (data.lexer === 'unknown') {
+                $('#guess_lexer_btn').css('color', 'red');
+            } else {
+                $('#id_lexer').val(data.lexer);
+                $('#guess_lexer_btn').css('color', 'inherit');
+            }
+        }).complete(function() {
+            lexerReq = null;
+        });
     });
 
     $('.autofocus input:text, .autofocus textarea').first().focus();
diff --git a/dpaste/templates/dpaste/snippet_details.html b/dpaste/templates/dpaste/snippet_details.html
index 3380383..b2ce35a 100644
--- a/dpaste/templates/dpaste/snippet_details.html
+++ b/dpaste/templates/dpaste/snippet_details.html
@@ -78,44 +78,55 @@
 {% block script_footer %}
 {{ block.super }}
 <script>
-jQuery(document).ready(function($){
-    $('.snippet-reply-hidden').click(function(e){
+jQuery(function($) {
+    var diffReq;
+
+    $('.snippet-reply-hidden').click(function(e) {
         $(this).removeClass('snippet-reply-hidden');
     });
 
     /**
-    * Diff Ajax Call
-    */
-    $('.snippet-diff-trigger').click(function(e){
+     * Diff Ajax Call
+     */
+    $('.snippet-diff-trigger').click(function(e) {
         e.preventDefault();
         $('#snippet-diff').slideDown('fast');
         $('#snippet-diff form').submit();
     });
 
 
-    $('form#diffform').submit(function() {
+    $('#diffform').submit(function() {
         var a = $('input[name="a"]:checked').val(),
-            b = $('input[name="b"]:checked').val(),
-            hash = 'D' + a + ',' + b;
-        $.get("{% url "snippet_diff" %}", {
+            b = $('input[name="b"]:checked').val();
+
+        window.location.hash = 'D' + a + ',' + b;
+
+        // Cancel previous request if it is still pending
+        if (diffReq) {
+            diffReq.abort();
+        }
+
+        diffReq = $.get("{% url "snippet_diff" %}", {
             a: a,
             b: b
-        }, function(data){
+        }).done(function(data) {
             $('#diff').html(data).slideDown('fast');
+        }).complete(function() {
+            diffReq = null;
         });
-        window.location.hash = hash;
+
         return false;
     });
 
     var curLine = document.location.hash,
         hashlist;
 
-    if (curLine.substring(0, 2) === '#D'){
+    if (curLine.substring(0, 2) === '#D') {
         hashlist = curLine.substring(2).split(',');
-        if (hashlist.length == 2) {
+        if (hashlist.length === 2) {
             console.log(hashlist);
-            $('form#diffform input[name="a"][value="'+hashlist[0]+'"]').attr('checked', true);
-            $('form#diffform input[name="b"][value="'+hashlist[1]+'"]').attr('checked', true);
+            $('#diffform input[name="a"][value="' + hashlist[0] + '"]').prop('checked', true);
+            $('#diffform input[name="b"][value="' + hashlist[1] + '"]').prop('checked', true);
             $('#snippet-diff').slideDown('fast');
             $('#snippet-diff form').submit();
         }
@@ -124,10 +135,8 @@ jQuery(document).ready(function($){
     /**
      * Line Highlighting
      */
-    var curLine = document.location.hash,
-        hashlist;
 
-    if (curLine.substring(0, 2) == '#L'){
+    if (curLine.substring(0, 2) === '#L') {
         hashlist = curLine.substring(2).split(',');
         if (hashlist.length > 0 && hashlist[0] !== '') {
             $.each(hashlist, function(index, elem){
@@ -136,15 +145,11 @@ jQuery(document).ready(function($){
         }
     }
 
-    $('.linenums li').click(function(e){
+    $('.linenums li').click(function(e) {
         var line = $(this),
             hash = 'L';
 
-        if (line.hasClass('marked')) {
-            line.removeClass('marked');
-        } else {
-            line.addClass('marked');
-        }
+        line.toggleClass('marked');
 
         $('.linenums li.marked').each(function (index, elem) {
             if (hash !== 'L') hash += ',';