diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp
index e791ba457..0cfeb88bf 100644
--- a/src/properties/propertieswidget.cpp
+++ b/src/properties/propertieswidget.cpp
@@ -245,7 +245,6 @@ void PropertiesWidget::loadTorrentInfos(const QTorrentHandle &_h) {
   try {
     // Save path
     updateSavePath(h);
-    changeSavePathButton->setEnabled(h.has_metadata());
     // Hash
     hash_lbl->setText(h.hash());
     PropListModel->model()->clear();
@@ -662,56 +661,6 @@ bool PropertiesWidget::applyPriorities() {
   return true;
 }
 
-
-void PropertiesWidget::on_changeSavePathButton_clicked() {
-  if (!h.is_valid()) return;
-  QString new_path;
-  if (h.has_metadata() && h.num_files() == 1) {
-    new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"),  h.firstFileSavePath());
-  } else {
-    const QDir saveDir(TorrentPersistentData::getSavePath(h.hash()));
-    new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), saveDir.absolutePath(),
-                                                 QFileDialog::DontConfirmOverwrite|QFileDialog::ShowDirsOnly|QFileDialog::HideNameFilterDetails);
-  }
-  if (!new_path.isEmpty()) {
-    // Check if savePath exists
-    QString save_path_dir = new_path.replace("\\", "/");
-    QString new_file_name;
-    if (h.has_metadata() && h.num_files() == 1) {
-      save_path_dir = fsutils::branchPath(save_path_dir, &new_file_name); // Skip file name
-    }
-    QDir savePath(fsutils::expandPath(save_path_dir));
-    // Actually move storage
-    if (!QBtSession::instance()->useTemporaryFolder() || h.is_seed()) {
-      if (!savePath.exists()) savePath.mkpath(savePath.absolutePath());
-      h.move_storage(savePath.absolutePath());
-    }
-    // Update save_path in dialog
-    QString display_path;
-    if (h.has_metadata() && h.num_files() == 1) {
-      // Rename the file
-      Q_ASSERT(!new_file_name.isEmpty());
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-      if (h.filename_at(0).compare(new_file_name, Qt::CaseInsensitive) != 0) {
-#else
-      if (h.filename_at(0).compare(new_file_name, Qt::CaseSensitive) != 0) {
-#endif
-        qDebug("Renaming single file to %s", qPrintable(new_file_name));
-        h.rename_file(0, new_file_name);
-        // Also rename it in the files list model
-        PropListModel->setData(PropListModel->index(0, 0), new_file_name);
-      }
-      display_path = h.firstFileSavePath();
-    } else {
-      display_path = savePath.absolutePath();
-    }
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-    display_path.replace("/", "\\");
-#endif
-    save_path->setText(display_path);
-  }
-}
-
 void PropertiesWidget::filteredFilesChanged() {
   if (h.is_valid()) {
     applyPriorities();
diff --git a/src/properties/propertieswidget.h b/src/properties/propertieswidget.h
index cb098557f..c3942b307 100644
--- a/src/properties/propertieswidget.h
+++ b/src/properties/propertieswidget.h
@@ -79,7 +79,6 @@ protected slots:
   void askWebSeed();
   void deleteSelectedUrlSeeds();
   void displayFilesListMenu(const QPoint& pos);
-  void on_changeSavePathButton_clicked();
   void filteredFilesChanged();
   void showPiecesDownloaded(bool show);
   void showPiecesAvailability(bool show);
diff --git a/src/properties/propertieswidget.ui b/src/properties/propertieswidget.ui
index 73cb212bc..edee14d0a 100644
--- a/src/properties/propertieswidget.ui
+++ b/src/properties/propertieswidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>551</width>
-    <height>274</height>
+    <height>452</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -49,8 +49,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>534</width>
-            <height>451</height>
+            <width>549</width>
+            <height>447</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -365,22 +365,6 @@
                   </property>
                  </widget>
                 </item>
-                <item>
-                 <widget class="QPushButton" name="changeSavePathButton">
-                  <property name="maximumSize">
-                   <size>
-                    <width>22</width>
-                    <height>15</height>
-                   </size>
-                  </property>
-                  <property name="text">
-                   <string notr="true">...</string>
-                  </property>
-                  <property name="flat">
-                   <bool>false</bool>
-                  </property>
-                 </widget>
-                </item>
                 <item>
                  <spacer name="horizontalSpacer_4">
                   <property name="orientation">
@@ -548,22 +532,6 @@
                <layout class="QHBoxLayout" name="horizontalLayout_4">
                 <item>
                  <widget class="QTextBrowser" name="comment_text">
-                  <property name="html">
-                   <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
-&lt;tr&gt;
-&lt;td style=&quot;border: none;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Cantarell';&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                  </property>
                   <property name="openExternalLinks">
                    <bool>true</bool>
                   </property>