diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/PaymentCell.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/PaymentCell.java
index 7f29f91094f14734c930377fdbe11b090b6acbd3..6219baf6ba69c2689393c6ba768729efd08d6d54 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/PaymentCell.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/cells/PaymentCell.java
@@ -241,8 +241,20 @@ public class PaymentCell extends ListCell<Payment>
 		if(selectedPayment == null)
 			return;
 
-		if(selectedPayment instanceof NormalPayment && item.getID() != selectedPayment.getID())
-			return;
+		if(selectedPayment instanceof NormalPayment)
+		{
+			if(item instanceof NormalPayment)
+			{
+				if(item.getID() != selectedPayment.getID())
+				{
+					return;
+				}
+			}
+			else
+			{
+				return;
+			}
+		}
 		
 		if(selectedPayment instanceof RepeatingPayment)
 		{				
@@ -250,7 +262,9 @@ public class PaymentCell extends ListCell<Payment>
 			{		
 				RepeatingPaymentEntry itemRepeating = (RepeatingPaymentEntry)item;
 				if(itemRepeating.getRepeatingPaymentID() != selectedPayment.getID())
+				{
 					return;
+				}
 			}
 			else
 			{