diff --git a/src/main/java/bwfdm/replaydh/ui/workflow/IdentifiableEditor.java b/src/main/java/bwfdm/replaydh/ui/workflow/IdentifiableEditor.java
index d129db1..df36c2a 100644
--- a/src/main/java/bwfdm/replaydh/ui/workflow/IdentifiableEditor.java
+++ b/src/main/java/bwfdm/replaydh/ui/workflow/IdentifiableEditor.java
@@ -253,8 +253,6 @@ protected IdentifiableEditor(Builder builder) {
 		type = builder.getType();
 		titleSelector = builder.getTitleSelector();
 		
-		Window currentWindow=GuiUtils.getActiveWindow();
-		
 		ResourceManager rm = ResourceManager.getInstance();
 		IconRegistry ir = IconRegistry.getGlobalRegistry();
 
diff --git a/src/main/java/bwfdm/replaydh/ui/workflow/WorkflowStepUIEditor.java b/src/main/java/bwfdm/replaydh/ui/workflow/WorkflowStepUIEditor.java
index aaa1fac..3250249 100644
--- a/src/main/java/bwfdm/replaydh/ui/workflow/WorkflowStepUIEditor.java
+++ b/src/main/java/bwfdm/replaydh/ui/workflow/WorkflowStepUIEditor.java
@@ -44,7 +44,6 @@
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
-import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -414,38 +413,43 @@ private void verifyInput(DocumentEvent e) {
     	QuerySettings settings = new QuerySettings();
 		settings.setSchema(schema);
     	// Title
-    	if(wrongInputList.contains(titleTextField.getText())) {
-    		titleTextField.setBorder(redBorder);
-    		inputCorrect = false;
-    	} else {
-    		titleTextField.setBorder(defaultBorder);
-    		if(titleTextField.hasFocus()) {
-    			if(waitingTimer.isRunning()) {
-    				waitingTimer.restart();
-    			} else {
-    				waitingTimer.start();
-    			}
-    		} else {
-    			waitingTimer.stop();
-    		}
-    	}
+		if (source == titleTextField.getDocument()) {
+			if (wrongInputList.contains(titleTextField.getText())) {
+				titleTextField.setBorder(redBorder);
+				inputCorrect = false;
+			} else {
+				titleTextField.setBorder(defaultBorder);
+				if (titleTextField.hasFocus()) {
+					if (waitingTimer.isRunning()) {
+						waitingTimer.restart();
+					} else {
+						waitingTimer.start();
+					}
+				} else {
+					waitingTimer.stop();
+				}
+			}
+		}
 
     	// Description
-    	if(wrongInputList.contains(descriptionTextArea.getText())) {
-    		descriptionScrollPane.setBorder(redBorder);
-    		inputCorrect = false;
-    	} else {
-    		descriptionScrollPane.setBorder(defaultBorder);
-    		if(descriptionTextArea.hasFocus()) {
-    			if(waitingTimer.isRunning()) {
-    				waitingTimer.restart();
-    			} else {
-    				waitingTimer.start();
-    			}
-    		} else {
-    			waitingTimer.stop();
-    		}
-    	}
+		if (source == descriptionTextArea.getDocument()) {
+			if (wrongInputList.contains(descriptionTextArea.getText())) {
+				descriptionScrollPane.setBorder(redBorder);
+				inputCorrect = false;
+			} else {
+
+				descriptionScrollPane.setBorder(defaultBorder);
+				if (descriptionTextArea.hasFocus()) {
+					if (waitingTimer.isRunning()) {
+						waitingTimer.restart();
+					} else {
+						waitingTimer.start();
+					}
+				} else {
+					waitingTimer.stop();
+				}
+			}
+		}
 
 
     	//TODO: add verification of the identifiables (Persons/Tool/Resources)