diff --git a/core/field_textinput.js b/core/field_textinput.js
index a38b418ed..41ca7bd1a 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -237,12 +237,12 @@ Blockly.FieldTextInput.prototype.doValueUpdate_ = function(newValue) {
  */
 Blockly.FieldTextInput.prototype.applyColour = function() {
   if (this.sourceBlock_ && this.constants_.FULL_BLOCK_FIELDS) {
-    if (this.sourceBlock_.isShadow()) {
-      this.sourceBlock_.pathObject.svgPath.setAttribute('fill', '#fff');
-    } else if (this.borderRect_) {
+    if (this.borderRect_) {
       this.borderRect_.setAttribute('stroke',
           this.sourceBlock_.style.colourTertiary);
       this.borderRect_.setAttribute('fill', '#fff');
+    } else if (this.sourceBlock_.isShadow()) {
+      this.sourceBlock_.pathObject.svgPath.setAttribute('fill', '#fff');
     }
   }
 };