diff --git a/packages/app-explorer/src/BlockQuery/ByHash.tsx b/packages/app-explorer/src/BlockInfo/ByHash.tsx
similarity index 100%
rename from packages/app-explorer/src/BlockQuery/ByHash.tsx
rename to packages/app-explorer/src/BlockInfo/ByHash.tsx
diff --git a/packages/app-explorer/src/BlockQuery/ByNumber.tsx b/packages/app-explorer/src/BlockInfo/ByNumber.tsx
similarity index 100%
rename from packages/app-explorer/src/BlockQuery/ByNumber.tsx
rename to packages/app-explorer/src/BlockInfo/ByNumber.tsx
diff --git a/packages/app-explorer/src/BlockQuery/Events.tsx b/packages/app-explorer/src/BlockInfo/Events.tsx
similarity index 100%
rename from packages/app-explorer/src/BlockQuery/Events.tsx
rename to packages/app-explorer/src/BlockInfo/Events.tsx
diff --git a/packages/app-explorer/src/BlockQuery/Extrinsics.tsx b/packages/app-explorer/src/BlockInfo/Extrinsics.tsx
similarity index 100%
rename from packages/app-explorer/src/BlockQuery/Extrinsics.tsx
rename to packages/app-explorer/src/BlockInfo/Extrinsics.tsx
diff --git a/packages/app-explorer/src/BlockQuery/Logs.tsx b/packages/app-explorer/src/BlockInfo/Logs.tsx
similarity index 100%
rename from packages/app-explorer/src/BlockQuery/Logs.tsx
rename to packages/app-explorer/src/BlockInfo/Logs.tsx
diff --git a/packages/app-explorer/src/BlockQuery/index.tsx b/packages/app-explorer/src/BlockInfo/index.tsx
similarity index 88%
rename from packages/app-explorer/src/BlockQuery/index.tsx
rename to packages/app-explorer/src/BlockInfo/index.tsx
index c6fa3a3f94..5efe27ee16 100644
--- a/packages/app-explorer/src/BlockQuery/index.tsx
+++ b/packages/app-explorer/src/BlockInfo/index.tsx
@@ -11,7 +11,6 @@ import { BlockNumber } from '@polkadot/types';
 
 import BlockByHash from './ByHash';
 import BlockByNumber from './ByNumber';
-import Query from './Query';
 
 type Props = BareProps & {
   chain_bestNumber?: BlockNumber,
@@ -50,17 +49,6 @@ class Entry extends React.Component<Props, State> {
   render () {
     const { value } = this.state;
 
-    return (
-      <>
-        <Query value={value} />
-        {this.renderBlock()}
-      </>
-    );
-  }
-
-  private renderBlock () {
-    const { value } = this.state;
-
     if (!value) {
       return null;
     }
diff --git a/packages/app-explorer/src/NodeInfo/index.tsx b/packages/app-explorer/src/NodeInfo/index.tsx
index 884f85e489..5744e6e2da 100644
--- a/packages/app-explorer/src/NodeInfo/index.tsx
+++ b/packages/app-explorer/src/NodeInfo/index.tsx
@@ -12,7 +12,7 @@ import { Health, PeerInfo, PendingExtrinsics } from '@polkadot/types';
 
 import './index.css';
 
-import Extrinsics from '../BlockQuery/Extrinsics';
+import Extrinsics from '../BlockInfo/Extrinsics';
 import Peers from './Peers';
 import Summary from './Summary';
 import translate from './translate';
diff --git a/packages/app-explorer/src/index.css b/packages/app-explorer/src/index.css
index fda999029b..6034b44905 100644
--- a/packages/app-explorer/src/index.css
+++ b/packages/app-explorer/src/index.css
@@ -93,3 +93,7 @@
     padding: 0 1em 1em;
   }
 }
+
+.explorer--query {
+  width: 20em;
+}
diff --git a/packages/app-explorer/src/index.tsx b/packages/app-explorer/src/index.tsx
index 2957595653..5372e03f2a 100644
--- a/packages/app-explorer/src/index.tsx
+++ b/packages/app-explorer/src/index.tsx
@@ -11,7 +11,7 @@ import { Route, Switch } from 'react-router';
 import Tabs, { TabItem } from '@polkadot/ui-app/Tabs';
 import translate from './translate';
 
-import BlockQuery from './BlockQuery';
+import BlockInfo from './BlockInfo';
 import Main from './Main';
 import NodeInfo from './NodeInfo';
 
@@ -56,11 +56,12 @@ class ExplorerApp extends React.Component<Props, State> {
           <Tabs
             basePath={basePath}
             items={items}
+            query={[undefined, 'query']}
           />
         </header>
         <Switch>
-          <Route path={`${basePath}/query/:value`} component={BlockQuery} />
-          <Route path={`${basePath}/query`} component={BlockQuery} />
+          <Route path={`${basePath}/query/:value`} component={BlockInfo} />
+          <Route path={`${basePath}/query`} component={BlockInfo} />
           <Route path={`${basePath}/node`} component={NodeInfo} />
           <Route component={Main} />
         </Switch>
diff --git a/packages/app-explorer/src/BlockQuery/Query.tsx b/packages/ui-app/src/Query.tsx
similarity index 95%
rename from packages/app-explorer/src/BlockQuery/Query.tsx
rename to packages/ui-app/src/Query.tsx
index 36ffc8ce73..1e7415675c 100644
--- a/packages/app-explorer/src/BlockQuery/Query.tsx
+++ b/packages/ui-app/src/Query.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { Button, Input } from '@polkadot/ui-app';
 import { isHex } from '@polkadot/util';
 
-import translate from '../translate';
+import translate from './translate';
 
 type Props = I18nProps & {
   value?: string
@@ -34,7 +34,7 @@ class Query extends React.PureComponent<Props, State> {
     const { value, isValid } = this.state;
 
     return (
-      <summary>
+      <summary className='explorer--query'>
         <div className='ui--row'>
           <div className='storage--actionrow head'>
             <Input
diff --git a/packages/ui-app/src/Tabs.tsx b/packages/ui-app/src/Tabs.tsx
index b89441598e..5b605b5192 100644
--- a/packages/ui-app/src/Tabs.tsx
+++ b/packages/ui-app/src/Tabs.tsx
@@ -8,6 +8,8 @@ import React from 'react';
 import { NavLink } from 'react-router-dom';
 
 import { classes } from './util';
+import Query from './Query';
+import { FilterOverlay } from '@polkadot/ui-app';
 
 export type TabItem = {
   hasParams?: boolean,
@@ -18,13 +20,13 @@ export type TabItem = {
 type Props = BareProps & {
   basePath: string,
   hidden?: Array<string>,
-  items: Array<TabItem>
+  items: Array<TabItem>,
+  query?: Array<string | undefined>
 };
 
 export default class Tabs extends React.PureComponent<Props> {
   render () {
-    const { className, hidden = [], items, style } = this.props;
-
+    const { className, hidden = [], items, query, style } = this.props;
     return (
       <div
         className={classes('ui--Menu ui menu tabular', className)}
@@ -35,6 +37,11 @@ export default class Tabs extends React.PureComponent<Props> {
             .filter(({ name }) => !hidden.includes(name))
             .map(this.renderItem)
         }
+        <FilterOverlay>
+          {query && query.includes(window.location.hash.split('/')[2]) && (
+            <Query/>
+          )}
+        </FilterOverlay>
       </div>
     );
   }