Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
===================================================================
diff -u -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b -rcc244cf148f0b2c246c5b6c588a9b843331b7e33
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision cc244cf148f0b2c246c5b6c588a9b843331b7e33)
@@ -774,9 +774,13 @@
 			if(isUserAuthorizedToModifyFolderContents(targetFolderID,userID)){
 				WorkspaceFolder currentFolder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,currentFolderID);
 				if(currentFolder!=null){
-					WorkspaceFolder targetFolder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,targetFolderID);
-					currentFolder.setParentWorkspaceFolder(targetFolder);
-					baseDAO.update(currentFolder);
+				    	if (currentFolderID != targetFolderID) {
+        					WorkspaceFolder targetFolder = (WorkspaceFolder)baseDAO.find(WorkspaceFolder.class,targetFolderID);
+        					currentFolder.setParentWorkspaceFolder(targetFolder);
+        					baseDAO.update(currentFolder);
+				    	} else {
+				    	    // if making a folder it's own parent, do nothing
+				    	}
 					flashMessage = new FlashMessage(MSG_KEY_MOVE, targetFolderID);
 				}else
 					throw new WorkspaceFolderException();