diff --git a/main/document/create_document.php b/main/document/create_document.php
index 3ade5e0664..d8b4fd564b 100755
--- a/main/document/create_document.php
+++ b/main/document/create_document.php
@@ -273,7 +273,7 @@ if (!$is_certificate_mode) {
 if (!$is_allowed_in_course) {
 	api_not_allowed(true);
 }
-if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'])) {
+if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || is_my_shared_folder($_user['user_id'], Security::remove_XSS($_GET['dir']),api_get_session_id()))) {
 	api_not_allowed(true);
 }
 
diff --git a/main/document/create_drawing.php b/main/document/create_drawing.php
index a4a20cff01..3ef4c641e2 100644
--- a/main/document/create_drawing.php
+++ b/main/document/create_drawing.php
@@ -86,9 +86,13 @@ if (isset ($_SESSION['_gid']) && $_SESSION['_gid'] != '') {
 if (!$is_allowed_in_course) {
 	api_not_allowed(true);
 }
-if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'])) {
+
+
+if (!($is_allowed_to_edit || $_SESSION['group_member_with_upload_rights'] || is_my_shared_folder($_user['user_id'], Security::remove_XSS($_GET['dir']),api_get_session_id()))) {
 	api_not_allowed(true);
 }
+
+
 /*	Header */
 event_access_tool(TOOL_DOCUMENT);
 $display_dir = $dir;
diff --git a/main/document/document.php b/main/document/document.php
index 4b040f2f4f..2c78a0b303 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -815,7 +815,7 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
 	/* CREATE NEW DOCUMENT OR NEW DIRECTORY / GO TO UPLOAD / DOWNLOAD ZIPPED FOLDER */
 
 	// Create new document
-	if (!$is_certificate_mode && !is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id)) {
+	if (!$is_certificate_mode) {
 ?>
 	<a href="create_document.php?<?php echo api_get_cidreq(); ?>&dir=<?php echo $curdirpathurl.$req_gid; ?>">
 		<?php Display::display_icon('filenew.gif', get_lang('CreateDoc')); echo get_lang('CreateDoc'); ?></a>&nbsp;
@@ -823,12 +823,10 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
 	}
 
 	// Create new draw
-		if (!$is_certificate_mode && !is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id)) {
 	?>
 		<a href="create_drawing.php?<?php echo api_get_cidreq(); ?>&dir=<?php echo $curdirpathurl.$req_gid; ?>">
 			<?php Display::display_icon('draw.png', get_lang('Draw')); echo get_lang('Draw'); ?></a>&nbsp;
-	<?php
-		}
+	<?php	
 
 	// Create new certificate
 	if ($is_certificate_mode) {
diff --git a/main/inc/lib/svg-edit/extensions/filesave.php b/main/inc/lib/svg-edit/extensions/filesave.php
index 25be0ef818..a25c0388da 100644
--- a/main/inc/lib/svg-edit/extensions/filesave.php
+++ b/main/inc/lib/svg-edit/extensions/filesave.php
@@ -128,6 +128,5 @@ file_put_contents( $documentPath, $contents );
 //add new document to database
 $doc_id = add_document($_course, $relativeUrlPath.'/'.$drawFileName, 'file', filesize($documentPath), $title);
 api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId,null, null,$current_session_id);
-api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $_user['user_id'], $groupId,null, null,$current_session_id);
 
 ?>
\ No newline at end of file