diff --git a/filemanager/inc/class.filemanager_shares.inc.php b/filemanager/inc/class.filemanager_shares.inc.php
index e8a56220a9..3224a8489f 100644
--- a/filemanager/inc/class.filemanager_shares.inc.php
+++ b/filemanager/inc/class.filemanager_shares.inc.php
@@ -108,6 +108,11 @@ class filemanager_shares extends filemanager_ui
 			}
 			$row['share_passwd'] = (boolean)$row['share_passwd'];
 			if ($row['share_with']) $row['share_with'] = preg_replace('/,([^ ])/', ', $1', $row['share_with']);
+
+			foreach(['share_created','share_last_accessed'] as $date_field)
+			{
+				$row[$date_field] = Api\DateTime::server2user($row[$date_field]);
+			}
 		}
 		return $total;
 	}
diff --git a/filemanager/inc/class.filemanager_ui.inc.php b/filemanager/inc/class.filemanager_ui.inc.php
index ac19856178..5783e98b7b 100644
--- a/filemanager/inc/class.filemanager_ui.inc.php
+++ b/filemanager/inc/class.filemanager_ui.inc.php
@@ -1003,9 +1003,7 @@ class filemanager_ui
 
 			foreach(['mtime','ctime'] as $date_field)
 			{
-				$time = new Api\DateTime($row[$date_field],Api\DateTime::$server_timezone);
-				$time->setUser();
-				$row[$date_field] = $time->format('ts');
+				$row[$date_field] = Api\DateTime::server2user($row[$date_field]);
 			}
 			$rows[++$n] = $row;
 			$path2n[$path] = $n;