diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3269d2934..c35165bef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
   * Added transition to card hovers to smooth animation
   * Support markdown makeup in claim description
   * Replaced free speech flag (used when image is missing) with labeled color tiles
+  * Added a loading message to file actions
 
 ### Changed
   * Publishes now uses claims rather than files
diff --git a/ui/js/actions/app.js b/ui/js/actions/app.js
index c29520720..d5014d9ad 100644
--- a/ui/js/actions/app.js
+++ b/ui/js/actions/app.js
@@ -13,6 +13,7 @@ import { doSearch } from "actions/search";
 import { doFetchDaemonSettings } from "actions/settings";
 import { doAuthenticate } from "actions/user";
 import { doFileList } from "actions/file_info";
+import { toQueryString } from "util/query_params";
 
 const { remote, ipcRenderer, shell } = require("electron");
 const path = require("path");
@@ -20,14 +21,10 @@ const { download } = remote.require("electron-dl");
 const fs = remote.require("fs");
 const { lbrySettings: config } = require("../../../app/package.json");
 
-const queryStringFromParams = params => {
-  return Object.keys(params).map(key => `${key}=${params[key]}`).join("&");
-};
-
 export function doNavigate(path, params = {}) {
   return function(dispatch, getState) {
     let url = path;
-    if (params) url = `${url}?${queryStringFromParams(params)}`;
+    if (params) url = `${url}?${toQueryString(params)}`;
 
     dispatch(doChangePath(url));
 
diff --git a/ui/js/component/fileActions/view.jsx b/ui/js/component/fileActions/view.jsx
index 53188a1f5..64fb859db 100644
--- a/ui/js/component/fileActions/view.jsx
+++ b/ui/js/component/fileActions/view.jsx
@@ -142,6 +142,8 @@ class FileActions extends React.PureComponent {
           onClick={() => openInShell(fileInfo)}
         />
       );
+    } else if (!fileInfo) {
+      content = <BusyMessage message={__("Fetching file info")} />;
     } else {
       console.log("handle this case of file action props?");
     }