diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 6364234d2..f9f8c66da 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -135,6 +135,7 @@ define(req, function(AppConfig, Default, Language) {
     };
     /// XXX
     Messages.fo_trash_move_error = "Shared items cannot be moved to your trash folder. Use \"Remove\" option to remove them from the drive instead.";
+    Messages.fo_sharedFolder_move_error = "Shared folders cannot be moved inside other shared folders.";
 
     return Messages;
 
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index b169fb6b4..47cdb0a2c 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2144,13 +2144,20 @@ define([
             var movedPaths = [];
 
             var sharedF = false;
+            var draggedSharedFolder = false;       
             oldPaths.forEach(function (p) {
                 movedPaths.push(p.path);
                 if (!sharedF && manager.isInSharedFolder(p.path)) {
                     sharedF = true;
                 }
+                if (!draggedSharedFolder && p.value && p.value.el && manager.isSharedFolder(p.value.el)) {
+                    draggedSharedFolder = true;
+                }
             });
 
+            if (draggedSharedFolder && manager.isInSharedFolder(newPath)) {
+                return void UI.warn(Messages.fo_sharedFolder_move_error);
+            }
             if (sharedF && manager.isPathIn(newPath, [TRASH])) {
                 // TODO create a key here?
                 // You can't move to YOUR trash documents stored in a shared folder