diff --git a/packages/api/src/controllers/cloud.js b/packages/api/src/controllers/cloud.js
index 3ecc8a3ae..6ced0b435 100644
--- a/packages/api/src/controllers/cloud.js
+++ b/packages/api/src/controllers/cloud.js
@@ -1,10 +1,4 @@
-const fs = require('fs-extra');
-const _ = require('lodash');
-const path = require('path');
-const { appdir } = require('../utility/directories');
-const socket = require('../utility/socket');
-const connections = require('./connections');
-const { getPublicCloudFiles } = require('../utility/cloudIntf');
+const { getPublicCloudFiles, getPublicFileData } = require('../utility/cloudIntf');
 
 module.exports = {
   publicFiles_meta: true,
@@ -12,4 +6,10 @@ module.exports = {
     const res = await getPublicCloudFiles();
     return res;
   },
+
+  publicFileData_meta: true,
+  async publicFileData({ path }) {
+    const res = getPublicFileData(path);
+    return res;
+  },
 };
diff --git a/packages/api/src/utility/cloudIntf.js b/packages/api/src/utility/cloudIntf.js
index b39fab441..a341d6dcf 100644
--- a/packages/api/src/utility/cloudIntf.js
+++ b/packages/api/src/utility/cloudIntf.js
@@ -161,9 +161,15 @@ async function getPublicCloudFiles() {
   return cloudFiles;
 }
 
+async function getPublicFileData(path) {
+  const resp = await axios.default.get(`${DBGATE_CLOUD_URL}/public/${path}`, getExternalParamsWithLicense(false));
+  return resp.data;
+}
+
 module.exports = {
   createDbGateIdentitySession,
   startCloudTokenChecking,
   startCloudFiles,
   getPublicCloudFiles,
+  getPublicFileData,
 };
diff --git a/packages/web/src/appobj/CloudFileAppObject.svelte b/packages/web/src/appobj/CloudFileAppObject.svelte
index de547b2a2..3e403146a 100644
--- a/packages/web/src/appobj/CloudFileAppObject.svelte
+++ b/packages/web/src/appobj/CloudFileAppObject.svelte
@@ -5,25 +5,43 @@
 </script>
 
 <script lang="ts">
-  import openNewTab from '../utility/openNewTab';
-  import { copyTextToClipboard } from '../utility/clipboard';
-  import { showModal } from '../modals/modalTools';
-  import ConfirmModal from '../modals/ConfirmModal.svelte';
-  import getElectron from '../utility/getElectron';
-  import FavoriteModal from '../modals/FavoriteModal.svelte';
   import { apiCall } from '../utility/api';
+  import newQuery from '../query/newQuery';
 
   export let data;
 
+  async function handleOpenSqlFile() {
+    const fileData = await apiCall('cloud/public-file-data', { path: data.path });
+    newQuery({
+      initialData: fileData.text,
+    });
+  }
+
   function createMenu() {
-    return [];
-    //   return [
-    //     { text: 'Delete', onClick: handleDelete },
-    //     { text: 'Edit', onClick: editFavorite },
-    //     { text: 'Edit JSON definition', onClick: editFavoriteJson },
-    //     !electron && data.urlPath && { text: 'Copy link', onClick: copyLink },
-    //   ];
+    return [{ text: 'Open', onClick: handleOpenSqlFile }];
   }
 </script>
 
-<AppObjectCore {...$$restProps} {data} icon={'img sql-file'} title={data.title} menu={createMenu} />
+<AppObjectCore
+  {...$$restProps}
+  {data}
+  icon={'img sql-file'}
+  title={data.title}
+  menu={createMenu}
+  on:click={handleOpenSqlFile}
+>
+  {#if data.description}
+    <div class="info">
+      {data.description}
+    </div>
+  {/if}
+</AppObjectCore>
+
+<style>
+  .info {
+    margin-left: 30px;
+    margin-right: 5px;
+    color: var(--theme-font-3);
+    white-space: nowrap;
+  }
+</style>
diff --git a/packages/web/src/widgets/CloudItemsWidget.svelte b/packages/web/src/widgets/CloudItemsWidget.svelte
index 6c6a2036e..82b007706 100644
--- a/packages/web/src/widgets/CloudItemsWidget.svelte
+++ b/packages/web/src/widgets/CloudItemsWidget.svelte
@@ -17,7 +17,11 @@
 <WidgetColumnBar>
   <WidgetColumnBarItem title="Public cloud" name="cloud" height="70%" storageName="publicCloudItems">
     <WidgetsInnerContainer>
-      <AppObjectList list={$publicFiles || []} module={cloudFileAppObject} groupFunc={data => data.folder} />
+      <AppObjectList
+        list={$publicFiles || []}
+        module={cloudFileAppObject}
+        groupFunc={data => data.folder || undefined}
+      />
     </WidgetsInnerContainer>
   </WidgetColumnBarItem>