diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index f169cecf..49af1e6f 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -37,7 +37,7 @@
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1e02112873d0b86eb1ac",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=dc4aa33310fc98be6749",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a547f8b4e9a83935a777",
-    "/chunks/files.js": "/chunks/files.js?id=83bffabbcec097fd3aac",
+    "/chunks/files.js": "/chunks/files.js?id=e67d0bb15c66cd46cf65",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks~ad7e36b9.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/files~chunks~ad7e36b9.js?id=be2d7938bf33c26784fd",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~b068369d.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~b068369d.js?id=e04827456ff09a9c4c4d",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~ab58556a.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~ab58556a.js?id=afa7d2dd8e1cc9c5947c",
@@ -58,8 +58,8 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=17469545c5b6a16c3bbf",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=0dd0a5efe0e3cb511c48",
     "/chunks/plans.js": "/chunks/plans.js?id=5a3c28288952fcad96e5",
-    "/chunks/platform.js": "/chunks/platform.js?id=ef6b3e1035ab17811965",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=6c8ba90269dce3b0a2cf",
+    "/chunks/platform.js": "/chunks/platform.js?id=c215926a01a5b06126e6",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=086ef86debc9e0957643",
     "/chunks/profile.js": "/chunks/profile.js?id=658aa03af778cc2cc100",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=ddb7be518c092ed392ca",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=4b176796d100a2b24d71",
@@ -336,5 +336,12 @@
     "/chunks/platform.365ed255b193d9439fa8.hot-update.js": "/chunks/platform.365ed255b193d9439fa8.hot-update.js",
     "/chunks/platform.084683751d8742219117.hot-update.js": "/chunks/platform.084683751d8742219117.hot-update.js",
     "/chunks/platform.9fe84c8bd29a135f27bb.hot-update.js": "/chunks/platform.9fe84c8bd29a135f27bb.hot-update.js",
-    "/chunks/platform.f96a9e70557dc38c3516.hot-update.js": "/chunks/platform.f96a9e70557dc38c3516.hot-update.js"
+    "/chunks/platform.f96a9e70557dc38c3516.hot-update.js": "/chunks/platform.f96a9e70557dc38c3516.hot-update.js",
+    "/chunks/files.284553ed8c1233b2d562.hot-update.js": "/chunks/files.284553ed8c1233b2d562.hot-update.js",
+    "/chunks/files.d8d58d4ebc0b01de7e2e.hot-update.js": "/chunks/files.d8d58d4ebc0b01de7e2e.hot-update.js",
+    "/chunks/platform~chunks/shared.c21bfea21db050bbf46a.hot-update.js": "/chunks/platform~chunks/shared.c21bfea21db050bbf46a.hot-update.js",
+    "/chunks/platform~chunks/shared.5de1f71813311f7ec30a.hot-update.js": "/chunks/platform~chunks/shared.5de1f71813311f7ec30a.hot-update.js",
+    "/chunks/platform~chunks/shared.dc0f077c261e70697cd3.hot-update.js": "/chunks/platform~chunks/shared.dc0f077c261e70697cd3.hot-update.js",
+    "/js/main.57a6d75d4f2764f144f8.hot-update.js": "/js/main.57a6d75d4f2764f144f8.hot-update.js",
+    "/chunks/platform.27acd412f4f57a1fed1c.hot-update.js": "/chunks/platform.27acd412f4f57a1fed1c.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/DesktopToolbar.vue b/resources/js/components/FilesView/DesktopToolbar.vue
index 257a94e1..33caf314 100644
--- a/resources/js/components/FilesView/DesktopToolbar.vue
+++ b/resources/js/components/FilesView/DesktopToolbar.vue
@@ -51,7 +51,7 @@
 						</PopoverItem>
 					</PopoverWrapper>
 
-					<ToolbarButton v-if="canShowConvertToTeamFolder" @click.native="$updateTeamFolder(clipboard[0])" :class="{'is-inactive': ! canCreateTeamFolderInView }" source="user-plus" :action="$t('actions.convert_into_team_folder')" />
+					<ToolbarButton v-if="canShowConvertToTeamFolder" @click.native="$convertAsTeamFolder(clipboard[0])" :class="{'is-inactive': ! canCreateTeamFolderInView }" source="user-plus" :action="$t('actions.convert_into_team_folder')" />
 					<ToolbarButton @click.native="$shareFileOrFolder(clipboard[0])" :class="{'is-inactive': canShareInView }" source="share" :action="$t('actions.share')" />
 				</ToolbarGroup>
 
diff --git a/resources/js/components/Teams/CreateTeamFolderPopup.vue b/resources/js/components/Teams/CreateTeamFolderPopup.vue
index bcf4b13b..e9c63182 100644
--- a/resources/js/components/Teams/CreateTeamFolderPopup.vue
+++ b/resources/js/components/Teams/CreateTeamFolderPopup.vue
@@ -176,7 +176,7 @@
                 if (args.name !== 'create-team-folder') return
 
 				if (args.item) {
-					this.item = args.item[0]
+					this.item = args.item
 				}
             })
 
diff --git a/resources/js/helpers/itemHelpers.js b/resources/js/helpers/itemHelpers.js
index 512198ce..d12553ca 100644
--- a/resources/js/helpers/itemHelpers.js
+++ b/resources/js/helpers/itemHelpers.js
@@ -45,10 +45,14 @@ const itemHelpers = {
 			})
 		},
 
-		Vue.prototype.$createTeamFolder = function (entry) {
+		Vue.prototype.$createTeamFolder = function () {
 			events.$emit('popup:open', {name: 'create-team-folder'})
 		}
 
+		Vue.prototype.$convertAsTeamFolder = function (entry) {
+			events.$emit('popup:open', {name: 'create-team-folder', item: entry})
+		}
+
 		Vue.prototype.$updateTeamFolder = function (entry) {
 			events.$emit('popup:open', {name: 'update-team-folder', item: entry})
 		}
diff --git a/resources/js/views/FileView/Files.vue b/resources/js/views/FileView/Files.vue
index d8c3d190..c06f1925 100644
--- a/resources/js/views/FileView/Files.vue
+++ b/resources/js/views/FileView/Files.vue
@@ -54,7 +54,7 @@
 				</OptionGroup>
 				<OptionGroup>
 					<Option @click.native="$shareFileOrFolder(item)" :title="item.data.relationships.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
-					<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="user-plus" />
+					<Option @click.native="$convertAsTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="user-plus" />
 				</OptionGroup>
 				<OptionGroup>
 					<Option @click.native="$openInDetailPanel(item)" :title="$t('context_menu.detail')" icon="detail" />