diff --git a/includes/media_browser_plus.folders.inc b/includes/media_browser_plus.folders.inc
index 858c40f..2b66a67 100644
--- a/includes/media_browser_plus.folders.inc
+++ b/includes/media_browser_plus.folders.inc
@@ -424,6 +424,8 @@ 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', $destination);
+
   if (!empty($source)) {
     $source .= '/';
   }
@@ -432,7 +434,7 @@ function media_browser_plus_move_root_folder($source, $destination) {
   }
   $scheme = variable_get('file_default_scheme', 'public') . '://';
   $source = $scheme . $source;
-  $destination = $scheme . $destination;
+  $destination = $scheme . token_replace($destination);
 
   file_prepare_directory($destination, FILE_CREATE_DIRECTORY);
 
@@ -463,8 +465,6 @@ function media_browser_plus_move_root_folder($source, $destination) {
     $subfolder_destination = str_replace($source, $destination, $subfolder_source);
     media_browser_plus_move_subfolder($subfolder, $subfolder_source, $subfolder_destination);
   }
-
-  variable_set('media_root_folder', trim($destination, '/'));
 }
 
 /**
diff --git a/media_browser_plus.install b/media_browser_plus.install
index 05fbd61..9d65076 100644
--- a/media_browser_plus.install
+++ b/media_browser_plus.install
@@ -162,7 +162,7 @@ function media_browser_plus_enable() {
 
   // Create the media folder.
   media_browser_plus_get_media_root_folder(TRUE);
-  $dir = variable_get('file_default_scheme', 'public') . '://' . variable_get('media_root_folder') . '/';
+  $dir = variable_get('file_default_scheme', 'public') . '://' . token_replace(variable_get('media_root_folder')) . '/';
   file_prepare_directory($dir, FILE_CREATE_DIRECTORY);
 }
 
diff --git a/media_browser_plus.module b/media_browser_plus.module
index 4cf14bf..ff29640 100644
--- a/media_browser_plus.module
+++ b/media_browser_plus.module
@@ -1978,9 +1978,9 @@ function _media_browser_plus_media_basket_select_button() {
  *   The path to the requested folder. Doesn't have a trailing slash.
  */
 function media_browser_plus_construct_dir_path($term = NULL) {
-  $path = variable_get('file_default_scheme', 'public') . '://';
-  if ($root_folder = variable_get('media_root_folder')) {
-    $path = $root_folder . '/';
+  $path = $scheme = variable_get('file_default_scheme', 'public') . '://';
+  if ($root_folder = token_replace(variable_get('media_root_folder'))) {
+    $path = $scheme . $root_folder . '/';
   }
   $root_folder_term = media_browser_plus_get_media_root_folder();
   if ($term) {