diff --git a/src/org/hwo/models/ComboBoxHistoryModel.java b/src/org/hwo/models/ComboBoxHistoryModel.java
index f7ccad6..e59e45e 100644
--- a/src/org/hwo/models/ComboBoxHistoryModel.java
+++ b/src/org/hwo/models/ComboBoxHistoryModel.java
@@ -9,8 +9,8 @@ import javax.swing.event.ListDataListener;
 
 public class ComboBoxHistoryModel<E> implements ComboBoxModel<E> {
 
-	private LinkedList<ListDataListener> listDataListeners = new LinkedList();
-	private LinkedList<E> items = new LinkedList();
+	private LinkedList<ListDataListener> listDataListeners = new LinkedList<>();
+	private LinkedList<E> items = new LinkedList<>();
 	
 	private E selectedItem;
 	private int historySize;
@@ -68,7 +68,9 @@ public class ComboBoxHistoryModel<E> implements ComboBoxModel<E> {
 			items.remove(selectedItem);
 		}
 		items.add(0,selectedItem);
-		clampHistory();
+		if (!clampHistory()) {
+			fireContentsChanged();
+		}
 	}
 
 	public int getHistorySize() {