diff --git a/app/src/main/java/org/toop/app/widget/complex/ViewWidget.java b/app/src/main/java/org/toop/app/widget/complex/ViewWidget.java
index 59aa184..217ac86 100644
--- a/app/src/main/java/org/toop/app/widget/complex/ViewWidget.java
+++ b/app/src/main/java/org/toop/app/widget/complex/ViewWidget.java
@@ -60,7 +60,7 @@ public abstract class ViewWidget extends StackWidget {
 	}
 
 	public void removeIndexFromPreviousChain(int index) {
-		ViewWidget view = previous;
+		ViewWidget view = this;
 
 		while (index > 0 && view != null) {
 			index--;
@@ -76,15 +76,18 @@ public abstract class ViewWidget extends StackWidget {
 	}
 
 	public void removeViewFromPreviousChain(ViewWidget view) {
+		ViewWidget prev = previous;
 		int index = 0;
 
-		while (previous != null) {
+		while (prev != null) {
 			index++;
 
-			if (previous == view) {
+			if (prev == view) {
 				removeIndexFromPreviousChain(index);
 				break;
 			}
+
+			prev = prev.previous;
 		}
 	}