diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 05e539c296..15b522359f 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -186,7 +186,6 @@ set( PCBNEW_DIALOGS
     dialogs/panel_setup_text_and_graphics_base.cpp
     dialogs/panel_setup_tracks_and_vias.cpp
     dialogs/panel_setup_tracks_and_vias_base.cpp
-    dialogs/pcb_properties_panel.cpp
     footprint_wizard.cpp
     footprint_wizard_frame.cpp
     footprint_wizard_frame_functions.cpp
@@ -375,6 +374,7 @@ set( PCBNEW_CLASS_SRCS
     widgets/appearance_controls_base.cpp
     widgets/panel_selection_filter.cpp
     widgets/panel_selection_filter_base.cpp
+    widgets/pcb_properties_panel.cpp
     widgets/pcb_search_pane.cpp
     widgets/search_handlers.cpp
 
diff --git a/pcbnew/pcb_base_edit_frame.cpp b/pcbnew/pcb_base_edit_frame.cpp
index f627d4313c..7483e40672 100644
--- a/pcbnew/pcb_base_edit_frame.cpp
+++ b/pcbnew/pcb_base_edit_frame.cpp
@@ -38,8 +38,8 @@
 #include <settings/color_settings.h>
 #include <settings/settings_manager.h>
 #include <widgets/appearance_controls.h>
+#include <widgets/pcb_properties_panel.h>
 #include <dialogs/eda_view_switcher.h>
-#include <pcb_properties_panel.h>
 #include <wildcards_and_files_ext.h>
 #include <collectors.h>
 
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 82f94f055f..5c893740b3 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -38,7 +38,6 @@
 #include <dialog_find.h>
 #include <dialog_footprint_properties.h>
 #include <dialogs/dialog_exchange_footprints.h>
-#include <pcb_properties_panel.h>
 #include <dialog_board_setup.h>
 #include <invoke_pcb_dialog.h>
 #include <board.h>
@@ -99,6 +98,7 @@
 #include <widgets/pcb_search_pane.h>
 #include <widgets/infobar.h>
 #include <widgets/panel_selection_filter.h>
+#include <widgets/pcb_properties_panel.h>
 #include <widgets/wx_aui_utils.h>
 #include <kiplatform/app.h>
 #include <profile.h>
diff --git a/pcbnew/toolbars_pcb_editor.cpp b/pcbnew/toolbars_pcb_editor.cpp
index 33ddb7690f..6045c2efdd 100644
--- a/pcbnew/toolbars_pcb_editor.cpp
+++ b/pcbnew/toolbars_pcb_editor.cpp
@@ -47,7 +47,7 @@
 #include <tools/pcb_actions.h>
 #include <tools/pcb_selection_tool.h>
 #include <widgets/appearance_controls.h>
-#include <dialogs/pcb_properties_panel.h>
+#include <widgets/pcb_properties_panel.h>
 #include <widgets/pcb_search_pane.h>
 #include <widgets/wx_aui_utils.h>
 #include <wx/wupdlock.h>
diff --git a/pcbnew/tools/properties_tool.cpp b/pcbnew/tools/properties_tool.cpp
index 853598baff..bad1677183 100644
--- a/pcbnew/tools/properties_tool.cpp
+++ b/pcbnew/tools/properties_tool.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "properties_tool.h"
-#include <pcb_properties_panel.h>
+#include <widgets/pcb_properties_panel.h>
 #include <tool/actions.h>
 
 
diff --git a/pcbnew/dialogs/pcb_properties_panel.cpp b/pcbnew/widgets/pcb_properties_panel.cpp
similarity index 100%
rename from pcbnew/dialogs/pcb_properties_panel.cpp
rename to pcbnew/widgets/pcb_properties_panel.cpp
diff --git a/pcbnew/dialogs/pcb_properties_panel.h b/pcbnew/widgets/pcb_properties_panel.h
similarity index 100%
rename from pcbnew/dialogs/pcb_properties_panel.h
rename to pcbnew/widgets/pcb_properties_panel.h