diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
similarity index 100%
rename from retroshare-gui/src/gui/SearchDialog.cpp
rename to retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
diff --git a/retroshare-gui/src/gui/SearchDialog.h b/retroshare-gui/src/gui/FileTransfer/SearchDialog.h
similarity index 100%
rename from retroshare-gui/src/gui/SearchDialog.h
rename to retroshare-gui/src/gui/FileTransfer/SearchDialog.h
diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/FileTransfer/SearchDialog.ui
similarity index 100%
rename from retroshare-gui/src/gui/SearchDialog.ui
rename to retroshare-gui/src/gui/FileTransfer/SearchDialog.ui
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 963a6b20f..83a7ddd99 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -320,7 +320,6 @@ HEADERS +=  rshare.h \
             gui/RemoteDirModel.h \
             gui/RetroShareLink.h \
             gui/SearchTreeWidget.h \
-            gui/SearchDialog.h \
             gui/SharedFilesDialog.h \
             gui/ShareManager.h \
             gui/ShareDialog.h \
@@ -329,6 +328,7 @@ HEADERS +=  rshare.h \
             gui/HelpDialog.h \
             gui/LogoBar.h \
             gui/common/AvatarDialog.h \
+            gui/FileTransfer/SearchDialog.h \
             gui/FileTransfer/xprogressbar.h \
             gui/FileTransfer/DetailsDialog.h \
             gui/FileTransfer/FileTransferInfoWidget.h \
@@ -558,11 +558,11 @@ FORMS +=    gui/StartDialog.ui \
             gui/common/AvatarDialog.ui \
             gui/FileTransfer/TransfersDialog.ui \
             gui/FileTransfer/DetailsDialog.ui \
+            gui/FileTransfer/SearchDialog.ui \
             gui/MainWindow.ui \
             gui/NetworkView.ui \
             gui/MessengerWindow.ui \
             gui/FriendsDialog.ui \
-            gui/SearchDialog.ui \
             gui/SharedFilesDialog.ui \
             gui/ShareManager.ui \
             gui/ShareDialog.ui \
@@ -682,7 +682,6 @@ SOURCES +=  main.cpp \
             gui/RsAutoUpdatePage.cpp \
             gui/RetroShareLink.cpp \
             gui/SearchTreeWidget.cpp \
-            gui/SearchDialog.cpp \
             gui/SharedFilesDialog.cpp \
             gui/ShareManager.cpp \
             gui/ShareDialog.cpp \
@@ -694,6 +693,7 @@ SOURCES +=  main.cpp \
             gui/im_history/IMHistoryItemPainter.cpp \
             gui/help/browser/helpbrowser.cpp \
             gui/help/browser/helptextbrowser.cpp \
+            gui/FileTransfer/SearchDialog.cpp \
             gui/FileTransfer/TransfersDialog.cpp \
             gui/FileTransfer/FileTransferInfoWidget.cpp \
             gui/FileTransfer/DLListDelegate.cpp \