diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 998a5d91..79cd5654 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -58,7 +58,7 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=6497bc01ac41c0caf1c8",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=2bdbb5f9141052aaaa3d",
     "/chunks/plans.js": "/chunks/plans.js?id=a3a16f546521050656fb",
-    "/chunks/platform.js": "/chunks/platform.js?id=07fd139d62a2c60f9468",
+    "/chunks/platform.js": "/chunks/platform.js?id=4d04abb09953403c2f9d",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=44a689222ea574701715",
     "/chunks/profile.js": "/chunks/profile.js?id=91ea55260c78ea4e7abd",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=7b80324eef831d31e3e8",
@@ -303,5 +303,9 @@
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.48f999cdca93f3df00c9.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.48f999cdca93f3df00c9.hot-update.js",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.1a74919e2105ff1a9639.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.1a74919e2105ff1a9639.hot-update.js",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.a0a16104619349adcf7b.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.a0a16104619349adcf7b.hot-update.js",
-    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.30e712e06f5558e6749c.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.30e712e06f5558e6749c.hot-update.js"
+    "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.30e712e06f5558e6749c.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.30e712e06f5558e6749c.hot-update.js",
+    "/chunks/platform.4ae986b0ccfb06bc688e.hot-update.js": "/chunks/platform.4ae986b0ccfb06bc688e.hot-update.js",
+    "/chunks/platform.4e8b6c17baa0f800b27c.hot-update.js": "/chunks/platform.4e8b6c17baa0f800b27c.hot-update.js",
+    "/chunks/platform.ce7db58217428f876be9.hot-update.js": "/chunks/platform.ce7db58217428f876be9.hot-update.js",
+    "/chunks/platform.cc92f5cec585527266c4.hot-update.js": "/chunks/platform.cc92f5cec585527266c4.hot-update.js"
 }
diff --git a/resources/js/components/Teams/Components/TeamList.vue b/resources/js/components/Teams/Components/TeamList.vue
index c46911c1..762b1785 100644
--- a/resources/js/components/Teams/Components/TeamList.vue
+++ b/resources/js/components/Teams/Components/TeamList.vue
@@ -1,6 +1,6 @@
 <template>
 	<ul class="member-list">
-		<li v-if="Object.values(members).length > 0" v-for="(entry, i) in members" :key="i" class="member-item">
+		<li v-if="Object.values(members).length > 0 && entry.id !== user.data.id" v-for="(entry, i) in members" :key="i" class="member-item">
 			<div @click="deleteMember(entry)" class="terminate">
 				<x-icon size="14" class="close-icon" />
 			</div>
@@ -10,12 +10,20 @@
 					<TypedAvatar v-else :size="38" :letter="entry.email.substr(0, 1)" :color="entry.color"/>
 				</div>
 				<div v-if="entry.type === 'member'" class="info">
-					<b class="title">{{ entry.name }}</b>
-					<span class="subtitle">{{ entry.email }}</span>
+					<b class="title">
+						{{ entry.name }}
+					</b>
+					<span class="subtitle">
+						{{ entry.email }}
+					</span>
 				</div>
 				<div v-if="entry.type === 'invitation'" class="info">
-					<b class="title">{{ entry.email }}</b>
-					<span v-if="entry.id" class="subtitle">{{ $t('Waiting for accept invitation...') }}</span>
+					<b class="title">
+						{{ entry.email }}
+					</b>
+					<span v-if="entry.id" class="subtitle">
+						{{ $t('Waiting for accept invitation...') }}
+					</span>
 				</div>
 			</div>
 			<div class="action">
@@ -29,12 +37,18 @@
 	import PermissionToggleButton from "./PermissionToggleButton"
 	import TypedAvatar from "../../Others/TypedAvatar"
 	import {XIcon} from 'vue-feather-icons'
+	import {mapGetters} from "vuex";
 
 	export default {
 		name: "TeamList",
 		props: [
 			'value',
 		],
+		computed: {
+			...mapGetters([
+				'user'
+			])
+		},
 		components: {
 			PermissionToggleButton,
 			TypedAvatar,
diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php
index 7f36699d..8bea820a 100644
--- a/src/App/Console/Commands/SetupDevEnvironment.php
+++ b/src/App/Console/Commands/SetupDevEnvironment.php
@@ -832,6 +832,13 @@ class SetupDevEnvironment extends Command
                 'permission' => 'can-edit',
             ]);
 
+        DB::table('team_folder_members')
+            ->insert([
+                'parent_id'  => $folder->id,
+                'user_id'    => $owner->id,
+                'permission' => 'owner',
+            ]);
+
         // Get meme gallery
         collect([
             'Sofishticated.jpg',
@@ -863,17 +870,17 @@ class SetupDevEnvironment extends Command
             'Eggcited bro.jpg',
             'Get a Rest.jpg',
         ])
-            ->each(function ($file) use ($owner, $hug) {
+            ->each(function ($file) use ($member, $hug) {
                 $basename = Str::random(12) . '-' . $file;
 
                 // Copy file into app storage
-                Storage::putFileAs("files/$owner->id", storage_path("demo/images/memes/$file"), $basename, 'private');
-                Storage::putFileAs("files/$owner->id", storage_path("demo/images/memes/thumbnail-$file"), "thumbnail-$basename", 'private');
+                Storage::putFileAs("files/$member->id", storage_path("demo/images/memes/$file"), $basename, 'private');
+                Storage::putFileAs("files/$member->id", storage_path("demo/images/memes/thumbnail-$file"), "thumbnail-$basename", 'private');
 
                 // Create file record
                 File::create([
                     'parent_id'  => $hug->id,
-                    'user_id'    => $owner->id,
+                    'user_id'    => $member->id,
                     'name'       => $file,
                     'basename'   => $basename,
                     'type'       => 'image',
diff --git a/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php b/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php
index eaad9a90..68c537b4 100644
--- a/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php
+++ b/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php
@@ -32,6 +32,7 @@ class BrowseSharedWithMeController
         if (!$id) {
             $sharedFolderIds = DB::table('team_folder_members')
                 ->where('user_id', Auth::id())
+                ->whereIn('permission', ['can-edit', 'can-view'])
                 ->pluck('parent_id');
 
             $folders = Folder::whereIn('id', $sharedFolderIds)
diff --git a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php
index 1a7a10ce..8989a09b 100644
--- a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php
+++ b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php
@@ -1,12 +1,14 @@
 <?php
 namespace Domain\Teams\Controllers;
 
+use Auth;
 use Illuminate\Http\Response;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Teams\Requests\ConvertIntoTeamFolderRequest;
 use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
+use Illuminate\Support\Facades\DB;
 
 class ConvertFolderIntoTeamFolderController extends Controller
 {
@@ -24,6 +26,14 @@ class ConvertFolderIntoTeamFolderController extends Controller
             'parent_id'   => null,
         ]);
 
+        // Attach owner into members
+        DB::table('team_folder_members')
+            ->insert([
+                'parent_id'  => $folder->id,
+                'user_id'    => $folder->user_id,
+                'permission' => 'owner',
+            ]);
+
         // Invite team members
         ($this->inviteMembers)($request->input('invitations'), $folder);
 
diff --git a/src/Domain/Teams/Controllers/TeamFoldersController.php b/src/Domain/Teams/Controllers/TeamFoldersController.php
index 94cfb96d..ad2496ca 100644
--- a/src/Domain/Teams/Controllers/TeamFoldersController.php
+++ b/src/Domain/Teams/Controllers/TeamFoldersController.php
@@ -63,6 +63,14 @@ class TeamFoldersController extends Controller
             'team_folder' => 1,
         ]);
 
+        // Attach owner into members
+        DB::table('team_folder_members')
+            ->insert([
+                'parent_id'  => $folder->id,
+                'user_id'    => $request->user()->id,
+                'permission' => 'owner',
+            ]);
+
         // Invite team members
         $this->inviteMembers->onQueue()->execute($data->invitations, $folder);