diff --git a/includes/media_browser_plus.folders.inc b/includes/media_browser_plus.folders.inc
index fd7c99d..a084308 100644
--- a/includes/media_browser_plus.folders.inc
+++ b/includes/media_browser_plus.folders.inc
@@ -424,6 +424,7 @@ function media_browser_plus_folder_save_folder($form_state) {
  *   Destination path.
  */
 function media_browser_plus_move_root_folder($source, $destination) {
+  variable_set('media_root_folder', trim($destination, '/'));
   if (!empty($source)) {
     $source .= '/';
   }
@@ -464,7 +465,6 @@ function media_browser_plus_move_root_folder($source, $destination) {
     media_browser_plus_move_subfolder($subfolder, $subfolder_source, $subfolder_destination);
   }
 
-  variable_set('media_root_folder', trim($destination, '/'));
 }
 
 /**