diff --git a/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js b/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js
index e5c04eb613..013014cd98 100644
--- a/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js
+++ b/scm-ui-components/packages/ui-components/src/forms/AddEntryToTableField.js
@@ -48,7 +48,7 @@ class AddEntryToTableField extends React.Component<Props, State> {
         <AddButton
           label={buttonLabel}
           action={this.addButtonClicked}
-          disabled={disabled}
+          disabled={disabled || this.state.entryToAdd ===""}
         />
       </div>
     );