diff --git a/src/ui/display.hpp b/src/ui/display.hpp
index b18fd3a3f9a88517409c916fb599fedd1ed8339a..3cf06dc2bd3d262c645b99e687ed0bdadf2478e5 100644
--- a/src/ui/display.hpp
+++ b/src/ui/display.hpp
@@ -15,7 +15,7 @@ namespace rmrf::ui {
  * It implements some basic information handling and a registry for
  * views.
  */
-class display : public std::enable_shared_from_this<display> {
+class display { // : public std::enable_shared_from_this<display> {
 public:
     typedef display self_type;
     typedef std::shared_ptr<self_type> ptr_type;
@@ -34,7 +34,7 @@ public:
     decltype(auto) sync(F &&f, Args &&... args) {
         lock_type lock(m);
 
-        return std::forward<F>(f)(shared_from_this(), std::forward<Args>(args)...);
+        return std::forward<F>(f)(nullptr /*shared_from_this()*/, std::forward<Args>(args)...);
     }
 };
 
diff --git a/src/ui/view.cpp b/src/ui/view.cpp
index e4f10730a352935e1c70677823809b018de73b7e..8128a309d64c2b156a8629d4ab071cec701e41f8 100644
--- a/src/ui/view.cpp
+++ b/src/ui/view.cpp
@@ -7,7 +7,7 @@ namespace rmrf::ui {
 
 view::view(const std::shared_ptr<view> &parent) : parent_view{parent}, child_views{} {
     if (this->parent_view) {
-        this->parent_view->add_child(this->shared_from_this());
+//        this->parent_view->add_child(this->shared_from_this());
     }
 }
 
@@ -17,7 +17,7 @@ view::~view() {
 
     // Notify our parent about us being destructed
     if (this->parent_view) {
-        this->parent_view->remove_child(this->shared_from_this());
+//        this->parent_view->remove_child(this->shared_from_this());
     }
 }
 
diff --git a/src/ui/view.hpp b/src/ui/view.hpp
index ebb0e13b61ff6e4da3394733436cb440042b83de..fff51ebffc4178c67addf9abfc42bbab29118130 100644
--- a/src/ui/view.hpp
+++ b/src/ui/view.hpp
@@ -14,7 +14,7 @@ namespace rmrf::ui {
 /**
  * This abstract class implements a view page.
  */
-class view : public ui_context, public std::enable_shared_from_this<view> {
+class view : public ui_context { //, public std::enable_shared_from_this<view> {
 private:
     std::shared_ptr<view> parent_view;
     std::list<std::shared_ptr<view>> child_views;