diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt
index c154956901a..ce816b6b64d 100644
--- a/Polyhedron/demo/Polyhedron/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt
@@ -202,7 +202,11 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
   target_link_libraries(scene_polyhedron_shortest_path_item scene_polyhedron_item_decorator scene_polyhedron_item scene_polylines_item)
 
   if(EIGEN3_FOUND )
+    qt5_wrap_ui( editionUI_FILES Plugins/Surface_modeling/Deform_mesh.ui )
     add_item(scene_textured_polyhedron_item Scene_textured_polyhedron_item.cpp texture.cpp)# Scene_textured_polyhedron_item.moc)
+    add_item(scene_edit_polyhedron_item Plugins/Surface_modeling/Scene_edit_polyhedron_item.cpp
+           ${editionUI_FILES})
+    target_link_libraries(scene_edit_polyhedron_item scene_polyhedron_item scene_polyhedron_item_k_ring_selection)
   endif()
 
   add_item(scene_implicit_function_item Scene_implicit_function_item.cpp  Color_ramp.cpp )#Scene_implicit_function_item.moc)
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_modeling/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Surface_modeling/CMakeLists.txt
index 676bda2d516..e84acc5d5ab 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Surface_modeling/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_modeling/CMakeLists.txt
@@ -1,11 +1,6 @@
 include( polyhedron_demo_macros )
 if ( EIGEN3_FOUND AND "${EIGEN3_VERSION}" VERSION_GREATER "3.1.90" )
-  qt5_wrap_ui( editionUI_FILES Deform_mesh.ui )
-  add_item(scene_edit_polyhedron_item Scene_edit_polyhedron_item.cpp
-           ${editionUI_FILES})
-
-  target_link_libraries(scene_edit_polyhedron_item scene_polyhedron_item scene_polyhedron_item_k_ring_selection)
-  polyhedron_demo_plugin(edit_polyhedron_plugin Edit_polyhedron_plugin ${editionUI_FILES})
+  polyhedron_demo_plugin(edit_polyhedron_plugin Edit_polyhedron_plugin Deform_mesh.ui)
   target_link_libraries(edit_polyhedron_plugin scene_polyhedron_item scene_edit_polyhedron_item)
 else()
   message(STATUS "NOTICE: The polyhedron edit plugin require Eigen 3.2 (or higher) and will not be available.")