diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt
index 4757d80ee7..6debff3cca 100644
--- a/pagelayout_editor/CMakeLists.txt
+++ b/pagelayout_editor/CMakeLists.txt
@@ -13,22 +13,25 @@ include_directories(
     ${INC_AFTER}
     )
 
-set( PL_EDITOR_SRCS
+set( DIALOGS_SRCS
+    dialogs/properties_frame.cpp
     dialogs/properties_frame_base.cpp
     dialogs/dialogs_for_printing.cpp
     dialogs/dialog_new_dataitem_base.cpp
     dialogs/dialog_new_dataitem.cpp
     dialogs/dialog_design_inspector_base.cpp
+    dialogs/design_inspector.cpp
     dialogs/panel_pl_editor_color_settings.cpp
     dialogs/panel_pl_editor_color_settings_base.cpp
-    design_inspector.cpp
+    )
+
+set( PL_EDITOR_SRCS
     pl_editor_layout.cpp
     files.cpp
     pl_editor_frame.cpp
     pl_editor_settings.cpp
     pl_draw_panel_gal.cpp
     pl_editor_undo_redo.cpp
-    properties_frame.cpp
     menubar.cpp
     toolbars_pl_editor.cpp
 
diff --git a/pagelayout_editor/design_inspector.cpp b/pagelayout_editor/dialogs/design_inspector.cpp
similarity index 100%
rename from pagelayout_editor/design_inspector.cpp
rename to pagelayout_editor/dialogs/design_inspector.cpp
diff --git a/pagelayout_editor/design_inspector.h b/pagelayout_editor/dialogs/design_inspector.h
similarity index 100%
rename from pagelayout_editor/design_inspector.h
rename to pagelayout_editor/dialogs/design_inspector.h
diff --git a/pagelayout_editor/properties_frame.cpp b/pagelayout_editor/dialogs/properties_frame.cpp
similarity index 100%
rename from pagelayout_editor/properties_frame.cpp
rename to pagelayout_editor/dialogs/properties_frame.cpp
diff --git a/pagelayout_editor/properties_frame.h b/pagelayout_editor/dialogs/properties_frame.h
similarity index 100%
rename from pagelayout_editor/properties_frame.h
rename to pagelayout_editor/dialogs/properties_frame.h