diff --git a/modules/ui/raw_tag_editor.js b/modules/ui/raw_tag_editor.js
index 1e28ec7f1..0242402e5 100644
--- a/modules/ui/raw_tag_editor.js
+++ b/modules/ui/raw_tag_editor.js
@@ -364,8 +364,10 @@ export function uiRawTagEditor(context) {
 
 
         function pushMore() {
+            // if pressing Tab on the last value field with content, add a blank row
             if (d3_event.keyCode === 9 && !d3_event.shiftKey &&
-                list.selectAll('li:last-child input.value').node() === this) {
+                list.selectAll('li:last-child input.value').node() === this &&
+                utilGetSetValue(d3_select(this))) {
                 addTag();
             }
         }