diff --git a/r2/r2/public/static/js/flair.js b/r2/r2/public/static/js/flair.js
index 5e9b6afac..9c81c4155 100644
--- a/r2/r2/public/static/js/flair.js
+++ b/r2/r2/public/static/js/flair.js
@@ -48,9 +48,10 @@ $(function() {
             customizer.addClass("texteditable");
             input.removeAttr("disabled");
             input.css("display", "block");
-            input.val($.trim($(this).children(".flair").text())).select();
+            input.val($.trim($(this).find(".flair, .linkflairlabel").text())).select();
             input.keyup(function() {
-                $(".flairselection .flair").text($(input).val()).attr("title", $(input).val());
+                $(".flairselection .flair, .flairselection .linkflairlabel")
+                    .text($(input).val()).attr("title", $(input).val());
             });
         } else {
             customizer.removeClass("texteditable");