diff --git a/Submodules/UIKit/include/UIControl.h b/Submodules/UIKit/include/UIControl.h
index 249da31..c19e85d 100644
--- a/Submodules/UIKit/include/UIControl.h
+++ b/Submodules/UIKit/include/UIControl.h
@@ -69,6 +69,7 @@ public:
 
     virtual void willGainFocus();
     virtual void willLoseFocus();
+    virtual void focusFailedToMove(UIFocusHeading heading);
     virtual void willChangeFocusHighlight(bool highlighted);
 
     virtual void willChangeHighlight(bool highlighted);
diff --git a/Submodules/UIKit/lib/UIControl.cpp b/Submodules/UIKit/lib/UIControl.cpp
index d023563..ef437b0 100644
--- a/Submodules/UIKit/lib/UIControl.cpp
+++ b/Submodules/UIKit/lib/UIControl.cpp
@@ -47,9 +47,14 @@ void UIControl::didUpdateFocusIn(UIFocusUpdateContext context, UIFocusAnimationC
     UIView::didUpdateFocusIn(context, coordinator);
 
     if (context.nextFocusedItem().lock() == shared_from_this()) {
-        coordinator->addCoordinatedAnimations([this]() {
-            willGainFocus();
-        });
+        // If previous and next focus items are the same, means that navigation failed
+        if (context.previouslyFocusedItem().lock() == context.nextFocusedItem().lock()) {
+            focusFailedToMove(context.focusHeading());
+        } else {
+            coordinator->addCoordinatedAnimations([this]() {
+                willGainFocus();
+            });
+        }
     } else {
         coordinator->addCoordinatedAnimations([this]() {
             _state[uint8_t (UIControlState::highlighted)] = false; // need to be revised
@@ -76,6 +81,10 @@ void UIControl::willLoseFocus() {
     layer()->setZPosition(0);
 }
 
+void UIControl::focusFailedToMove(UIFocusHeading heading) {
+
+}
+
 void UIControl::willChangeFocusHighlight(bool highlighted) {
     if (highlighted) {
         setTransform(NXAffineTransform::scale(1.02f));
diff --git a/Submodules/UIKit/lib/UIFocusSystem.cpp b/Submodules/UIKit/lib/UIFocusSystem.cpp
index 8e6cfd1..77672c4 100644
--- a/Submodules/UIKit/lib/UIFocusSystem.cpp
+++ b/Submodules/UIKit/lib/UIFocusSystem.cpp
@@ -95,7 +95,9 @@ void UIFocusSystem::sendEvent(const std::shared_ptr<UIEvent>& event) {
         }
     }
 
-    if (nextItem.expired()) return;
+    if (nextItem.expired()) {
+        nextItem = _focusedItem;
+    }
 
     context._nextFocusedItem = nextItem;
     applyFocusToItem(nextItem.lock(), context);
@@ -124,8 +126,12 @@ void UIFocusSystem::applyFocusToItem(const std::shared_ptr<UIFocusItem>& item, U
     UIFocusAnimationCoordinator coordinator;
     _focusedItem = item;
 
-    if (!context.previouslyFocusedItem().expired()) { context.previouslyFocusedItem().lock()->didUpdateFocusIn(context, &coordinator); }
-    if (!context.nextFocusedItem().expired()) { context.nextFocusedItem().lock()->didUpdateFocusIn(context, &coordinator); }
+    if (context.previouslyFocusedItem().lock() == context.nextFocusedItem().lock()) {
+        if (!context.previouslyFocusedItem().expired()) { context.previouslyFocusedItem().lock()->didUpdateFocusIn(context, &coordinator); }
+    } else {
+        if (!context.previouslyFocusedItem().expired()) { context.previouslyFocusedItem().lock()->didUpdateFocusIn(context, &coordinator); }
+        if (!context.nextFocusedItem().expired()) { context.nextFocusedItem().lock()->didUpdateFocusIn(context, &coordinator); }
+    }
 
     UIFocusAnimationContext animationContext;
     UIView::animate(animationContext.duration(), 0, curveEaseOut, [context, coordinator, animationContext]() {
diff --git a/Submodules/UIKit/lib/UIView.cpp b/Submodules/UIKit/lib/UIView.cpp
index fd3183c..6b3553c 100644
--- a/Submodules/UIKit/lib/UIView.cpp
+++ b/Submodules/UIKit/lib/UIView.cpp
@@ -395,7 +395,6 @@ void UIView::drawAndLayoutTreeIfNeeded() {
     updateSafeAreaInsetsIfNeeded();
     updateLayoutMarginIfNeeded();
     layoutIfNeeded();
-    _yoga->layoutIfNeeded();
 
     for (auto& subview: _subviews) {
         subview->drawAndLayoutTreeIfNeeded();
diff --git a/Submodules/UIKit/lib/YGLayout.cpp b/Submodules/UIKit/lib/YGLayout.cpp
index 4c67f5e..c09d1c2 100644
--- a/Submodules/UIKit/lib/YGLayout.cpp
+++ b/Submodules/UIKit/lib/YGLayout.cpp
@@ -232,4 +232,12 @@ bool YGLayout::isRoot() {
     return false;
 }
 
+bool YGLayout::isDirty() {
+    if (_isEnabled) {
+        return YGNodeIsDirty(_node);
+    }
+
+    return false;
+}
+
 }
diff --git a/app/Screens/NXTextScreen/NXTabBarController.cpp b/app/Screens/NXTextScreen/NXTabBarController.cpp
index ab3eff0..680b973 100644
--- a/app/Screens/NXTextScreen/NXTabBarController.cpp
+++ b/app/Screens/NXTextScreen/NXTabBarController.cpp
@@ -77,6 +77,33 @@ public:
         setBackgroundColor(std::nullopt);
     }
 
+    void focusFailedToMove(UIFocusHeading heading) override {
+        NXFloat x = 0;
+        NXFloat y = 0;
+        NXFloat power = 10;
+
+        switch (heading) {
+            case UIFocusHeading::up:
+                y = -1;
+                break;
+            case UIFocusHeading::down:
+                y = 1;
+                break;
+            case UIFocusHeading::left:
+                x = -1;
+                break;
+            case UIFocusHeading::right:
+                x = 1;
+                break;
+            default: break;
+        }
+
+        setTransform(NXAffineTransform::translationBy(x * power, y * power));
+        UIView::animate(0.3, 0, 0.4, 3, UIViewAnimationOptions::allowUserInteraction, [this]() {
+            setTransform(NXAffineTransform::identity);
+        });
+    }
+
     void setSelected(bool selected) override {
         UIControl::setSelected(selected);
         if (selected) {