diff --git a/GUI/Views/SampleDesigner/DesignerScene.cpp b/GUI/Views/SampleDesigner/DesignerScene.cpp
index 454599f3ba095ec7cc3c0d7702654d506b842c0c..7dc9ef1df33e9cc06cb191e5813b74ac5f59abc0 100644
--- a/GUI/Views/SampleDesigner/DesignerScene.cpp
+++ b/GUI/Views/SampleDesigner/DesignerScene.cpp
@@ -227,17 +227,15 @@ IView* DesignerScene::addViewForItem(SessionGraphicsItem* item)
 {
     ASSERT(item);
 
-    IView* view = getViewForItem(item);
+    if (IView* view = getViewForItem(item))
+        return view;
 
-    if (!view) {
-        view = SampleViewFactory::createSampleView(item->modelType());
-        if (view) {
-            m_ItemToView[item] = view;
-            view->setParameterizedItem(item);
-            addItem(view);
-            return view;
-        }
-    }
+    IView* view = SampleViewFactory::createSampleView(item->modelType());
+    if (!view)
+        return nullptr;
+    m_ItemToView[item] = view;
+    view->setParameterizedItem(item);
+    addItem(view);
     return view;
 }