diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index 5912ae74b..67ae12587 100644
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -751,7 +751,7 @@ a.author { margin-right: 0.5em; }
 }
 
 .flairselector .customizer { display: inline-block; }
-.flairselector .customizer input { display: block; }
+.flairselector .customizer input { display: none; }
 .flairselector .customizer button { display: inline !important; }
 
 .media-button .option { color: red; }
diff --git a/r2/r2/public/static/js/flair.js b/r2/r2/public/static/js/flair.js
index 734cd1590..975bfe847 100644
--- a/r2/r2/public/static/js/flair.js
+++ b/r2/r2/public/static/js/flair.js
@@ -44,16 +44,18 @@ $(function() {
         $(form).children('input[name="flair_template_id"]').val(this.id);
         var customizer = $(form).children(".customizer");
         var input = customizer.children("input");
-        input.val($.trim($(this).children(".flair").text())).select();
-        input.keyup(function() {
-            $(".flairselection .flair").text($(input).val());
-        });
         if ($(this).hasClass("texteditable")) {
             customizer.addClass("texteditable");
             input.removeAttr("disabled");
+            input.css("display", "block");
+            input.val($.trim($(this).children(".flair").text())).select();
+            input.keyup(function() {
+                $(".flairselection .flair").text($(input).val());
+            });
         } else {
             customizer.removeClass("texteditable");
             input.attr("disabled", "disabled");
+            input.css("display", "none");
         }
         $(".flairselection").html($(this).first().children().clone());
         $(".flairselector button").removeAttr("disabled");