diff --git a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveCloudNodeFactory.kt b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveCloudNodeFactory.kt
index a78d7751..f6cab838 100644
--- a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveCloudNodeFactory.kt
+++ b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveCloudNodeFactory.kt
@@ -38,10 +38,16 @@ internal object GoogleDriveCloudNodeFactory {
 	}
 
 	fun from(parent: GoogleDriveFolder, file: File): GoogleDriveNode {
-		return if (isFolder(file)) {
-			folder(parent, file)
-		} else {
-			file(parent, file)
+		return when {
+			isFolder(file) -> {
+				folder(parent, file)
+			}
+			isShortcutFolder(file) -> {
+				folder(parent, file.name, getNodePath(parent, file.name), file.shortcutDetails.targetId)
+			}
+			else -> {
+				file(parent, file)
+			}
 		}
 	}
 
@@ -49,6 +55,10 @@ internal object GoogleDriveCloudNodeFactory {
 		return file.mimeType == "application/vnd.google-apps.folder"
 	}
 
+	fun isShortcutFolder(file: File): Boolean {
+		return file.mimeType == "application/vnd.google-apps.shortcut" && file.shortcutDetails.targetMimeType == "application/vnd.google-apps.folder"
+	}
+
 	fun getNodePath(parent: GoogleDriveFolder, name: String): String {
 		return parent.path + "/" + name
 	}
diff --git a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
index fe021368..0f3cb14e 100644
--- a/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
+++ b/data/src/notFoss/java/org/cryptomator/data/cloud/googledrive/GoogleDriveImpl.kt
@@ -25,7 +25,6 @@ import org.cryptomator.util.file.LruFileCacheUtil
 import org.cryptomator.util.file.LruFileCacheUtil.Companion.retrieveFromLruCache
 import java.io.IOException
 import java.io.OutputStream
-import java.util.ArrayList
 import timber.log.Timber
 
 internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCloud, idCache: GoogleDriveIdCache) {
@@ -57,7 +56,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 
 	@Throws(IOException::class)
 	private fun findFile(parentDriveId: String?, name: String): File? {
-		val fileListQuery = client().files().list().setFields("files(id,mimeType,name,size)")
+		val fileListQuery = client().files().list().setFields("files(id,mimeType,name,size,shortcutDetails)")
 		fileListQuery.q = "name contains '$name' and '$parentDriveId' in parents and trashed = false"
 		return fileListQuery.execute().files.firstOrNull { it.name == name }
 	}
@@ -99,6 +98,8 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 		folder?.let {
 			if (GoogleDriveCloudNodeFactory.isFolder(it)) {
 				return idCache.cache(GoogleDriveCloudNodeFactory.folder(parent, it))
+			} else if(GoogleDriveCloudNodeFactory.isShortcutFolder(it)) {
+				return idCache.cache(GoogleDriveCloudNodeFactory.folder(parent, name, path, it.shortcutDetails.targetId))
 			}
 		}
 
@@ -127,7 +128,7 @@ internal class GoogleDriveImpl(context: Context, googleDriveCloud: GoogleDriveCl
 			val fileListQuery = client() //
 				.files() //
 				.list() //
-				.setFields("nextPageToken,files(id,mimeType,modifiedTime,name,size)") //
+				.setFields("nextPageToken,files(id,mimeType,modifiedTime,name,size,shortcutDetails)") //
 				.setPageSize(1000) //
 				.setPageToken(pageToken)
 			fileListQuery.q = "'" + folder.driveId + "' in parents and trashed = false"