diff --git a/client/pages/filespage.js b/client/pages/filespage.js
index 4b632d34..f695788b 100644
--- a/client/pages/filespage.js
+++ b/client/pages/filespage.js
@@ -213,12 +213,18 @@ export class FilesPage extends React.Component {
         if(this._search){
             this._search.unsubscribe();
         }
-        this._search = onSearch(search, this.state.path).subscribe((f) => {
+        this._search = onSearch(search, this.state.path).subscribe((f = []) => {
+            let l = f.length;
+            for(let i=0; i<l; i++){
+                f[i].link = createLink(f[i].type, f[i].path);
+                if(this.state.show_hidden == false){
+                    if(f[i].path.split("/").filter((chunk) => chunk[0] === "." ? true : false).length > 0){
+                        delete f[i].type;
+                    }
+                }
+            }
             this.setState({
-                files: f.map((f) => {
-                    f.link = createLink(f.type, f.path);
-                    return f;
-                }) || [],
+                files: f,
                 is_search: true,
                 metadata: {
                     can_rename: false,
diff --git a/client/pages/filespage/filesystem.js b/client/pages/filespage/filesystem.js
index 94fc358d..84fa9ecb 100644
--- a/client/pages/filespage/filesystem.js
+++ b/client/pages/filespage/filesystem.js
@@ -31,6 +31,7 @@ export class FileSystem extends React.PureComponent {
                           if(file.type === 'directory' || file.type === 'file' || file.type === 'link' || file.type === 'bucket'){
                               return ( <ExistingThing view={this.props.view} key={file.name+file.path+(file.icon || '')} file={file} path={this.props.path} metadata={this.props.metadata || {}} selectableKey={file} selected={this.props.selected.indexOf(file.path) !== -1} currentSelection={this.props.selected} /> );
                           }
+                          return null;
                       })
                   }
                   </ReactCSSTransitionGroup>