diff --git a/packages/app-js/src/ActionButtons.tsx b/packages/app-js/src/ActionButtons.tsx
index 19d7e195a7..4d385dc34e 100644
--- a/packages/app-js/src/ActionButtons.tsx
+++ b/packages/app-js/src/ActionButtons.tsx
@@ -6,7 +6,7 @@ import { BareProps, I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import { Button as SUIB, Popup } from 'semantic-ui-react';
-import { Button, Input, TxComponent } from '@polkadot/ui-app';
+import { Button, Input } from '@polkadot/ui-app';
 
 import translate from './translate';
 
@@ -27,7 +27,7 @@ type State = {
   snippetName: string
 };
 
-class ActionButtons extends TxComponent<Props, State> {
+class ActionButtons extends React.PureComponent<Props, State> {
   state: State = {
     isOpen: false,
     shareText: this.props.t('Generate link to share code example'),
@@ -59,7 +59,7 @@ class ActionButtons extends TxComponent<Props, State> {
         // FIXME: The <Popup /> event trigger on='hover' does not work together with the ui-app'
         // <Button /> component. That's why the original Semantic UI component is being used here.
         }
-        { isCustomExample &&
+        {isCustomExample && (
           <Popup
             content={t('Delete this custom example')}
             on='hover'
@@ -72,8 +72,8 @@ class ActionButtons extends TxComponent<Props, State> {
               />
             }
           />
-        }
-        { !(isCustomExample) &&
+        )}
+        {!(isCustomExample) && (
           <Popup
             className='popup-local'
             on='click'
@@ -88,10 +88,9 @@ class ActionButtons extends TxComponent<Props, State> {
             }
           >
             <Input
-              autoFocus={true}
-              onBlur={this.onPopupClose}
+              autoFocus
               onChange={this.onChangeName}
-              onEnter={this.submit}
+              onEnter={this.saveSnippet}
               maxLength={50}
               min={1}
               placeholder={t('Name your example')}
@@ -105,14 +104,12 @@ class ActionButtons extends TxComponent<Props, State> {
               onClick={this.saveSnippet}
             />
           </Popup>
-        }
-
+        )}
         <Button
           icon='play'
           isCircular
           isPositive
           onClick={runJs}
-          ref={this.button}
         />
         <Button
           icon='close'
@@ -127,6 +124,7 @@ class ActionButtons extends TxComponent<Props, State> {
 
   private generateLink = (): void => {
     const { generateLink, t } = this.props;
+
     this.setState({ shareText: t('Copied to clipboard') } as State);
     generateLink();
   }
diff --git a/packages/app-js/src/Output.tsx b/packages/app-js/src/Output.tsx
index 5e9522ac47..05273ea5e7 100644
--- a/packages/app-js/src/Output.tsx
+++ b/packages/app-js/src/Output.tsx
@@ -35,17 +35,21 @@ const renderEntry = ({ args, type }: Log, index: number): React.ReactNode => (
   </div>
 );
 
-export default (props: Props) => {
-  return (
-    <article className='container js--Output'>
-      <div className='logs-wrapper'>
-        <div className='logs-container'>
-          <pre className='logs-content'>
-            {props.logs.map(renderEntry)}
-          </pre>
+export default class Output extends React.PureComponent<Props> {
+  render () {
+    const { children, logs } = this.props;
+
+    return (
+      <article className='container js--Output'>
+        <div className='logs-wrapper'>
+          <div className='logs-container'>
+            <pre className='logs-content'>
+              {logs.map(renderEntry)}
+            </pre>
+          </div>
         </div>
-      </div>
-      {props.children}
-    </article>
-  );
-};
+        {children}
+      </article>
+    );
+  }
+}
diff --git a/packages/app-js/src/Playground.tsx b/packages/app-js/src/Playground.tsx
index abee2de74c..cc0cec447c 100644
--- a/packages/app-js/src/Playground.tsx
+++ b/packages/app-js/src/Playground.tsx
@@ -70,7 +70,9 @@ class Playground extends React.PureComponent<Props, State> {
   constructor (props: Props) {
     super(props);
 
-    this.snippets.forEach(snippet => snippet.code = `${makeWrapper(this.props.isDevelopment)}${snippet.code}`);
+    this.snippets.forEach((snippet) => {
+      snippet.code = `${makeWrapper(this.props.isDevelopment)}${snippet.code}`;
+    });
 
     this.state = {
       animated: true,
@@ -362,8 +364,8 @@ class Playground extends React.PureComponent<Props, State> {
     const existingSelection = document.getSelection()!;
 
     const selected = existingSelection && existingSelection.rangeCount > 0
-        ? existingSelection.getRangeAt(0)
-        : undefined;
+      ? existingSelection.getRangeAt(0)
+      : undefined;
 
     el.select();
     document.execCommand('copy');
@@ -381,6 +383,6 @@ class Playground extends React.PureComponent<Props, State> {
 export default withMulti(
   Playground,
   translate,
-  withApi,
-  withRouter
+  withRouter,
+  withApi
 );
diff --git a/packages/app-js/src/index.tsx b/packages/app-js/src/index.tsx
index 95e97688a5..e4db4508f0 100644
--- a/packages/app-js/src/index.tsx
+++ b/packages/app-js/src/index.tsx
@@ -12,7 +12,7 @@ import Playground from './Playground';
 
 type Props = AppProps & BareProps;
 
-class AppJs extends React.PureComponent<Props> {
+export default class AppJs extends React.PureComponent<Props> {
   render () {
     const { basePath } = this.props;
 
@@ -24,5 +24,3 @@ class AppJs extends React.PureComponent<Props> {
     );
   }
 }
-
-export default AppJs;