diff --git a/src/attributes/components/AttributeListPage/AttributeListPage.tsx b/src/attributes/components/AttributeListPage/AttributeListPage.tsx
index df735bd07..477cfff96 100644
--- a/src/attributes/components/AttributeListPage/AttributeListPage.tsx
+++ b/src/attributes/components/AttributeListPage/AttributeListPage.tsx
@@ -1,9 +1,9 @@
 import Button from "@material-ui/core/Button";
 import Card from "@material-ui/core/Card";
-
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
+import AppHeader from "@saleor/components/AppHeader";
 import SearchBar from "@saleor/components/SearchBar";
 import { sectionNames } from "@saleor/intl";
 import Container from "../../../components/Container";
@@ -23,10 +23,12 @@ export interface AttributeListPageProps
     SearchPageProps,
     TabPageProps {
   attributes: AttributeList_attributes_edges_node[];
+  onBack: () => void;
 }
 
 const AttributeListPage: React.FC<AttributeListPageProps> = ({
   onAdd,
+  onBack,
   initialSearch,
   onSearchChange,
   currentTab,
@@ -41,6 +43,9 @@ const AttributeListPage: React.FC<AttributeListPageProps> = ({
 
   return (
     <Container>
+      <AppHeader onBack={onBack}>
+        <FormattedMessage {...sectionNames.configuration} />
+      </AppHeader>
       <PageHeader title={intl.formatMessage(sectionNames.attributes)}>
         <Button onClick={onAdd} color="primary" variant="contained">
           <FormattedMessage
diff --git a/src/attributes/views/AttributeList/AttributeList.tsx b/src/attributes/views/AttributeList/AttributeList.tsx
index c8b8241d1..35ddbedf9 100644
--- a/src/attributes/views/AttributeList/AttributeList.tsx
+++ b/src/attributes/views/AttributeList/AttributeList.tsx
@@ -15,6 +15,7 @@ import DeleteFilterTabDialog from "@saleor/components/DeleteFilterTabDialog";
 import SaveFilterTabDialog, {
   SaveFilterTabDialogFormData
 } from "@saleor/components/SaveFilterTabDialog";
+import { configurationMenuUrl } from "@saleor/configuration";
 import useNavigator from "@saleor/hooks/useNavigator";
 import useNotifier from "@saleor/hooks/useNotifier";
 import usePaginator, {
@@ -165,6 +166,7 @@ const AttributeList: React.FC<AttributeListProps> = ({ params }) => {
                     isChecked={isSelected}
                     onAdd={() => navigate(attributeAddUrl())}
                     onAll={() => navigate(attributeListUrl())}
+                    onBack={() => navigate(configurationMenuUrl)}
                     onNextPage={loadNextPage}
                     onPreviousPage={loadPreviousPage}
                     onRowClick={id => () => navigate(attributeUrl(id))}
diff --git a/src/categories/views/CategoryList/CategoryList.tsx b/src/categories/views/CategoryList/CategoryList.tsx
index be57e3bda..7d5ff64dc 100644
--- a/src/categories/views/CategoryList/CategoryList.tsx
+++ b/src/categories/views/CategoryList/CategoryList.tsx
@@ -222,18 +222,20 @@ export const CategoryList: React.StatelessComponent<CategoryListProps> = ({
                     })}
                     variant="delete"
                   >
-                    <FormattedMessage
-                      defaultMessage="Are you sure you want to delete {counter, plural,
+                    <DialogContentText>
+                      <FormattedMessage
+                        defaultMessage="Are you sure you want to delete {counter, plural,
                         one {this category}
                         other {{displayQuantity} categories}
                       }?"
-                      values={{
-                        counter: maybe(() => params.ids.length),
-                        displayQuantity: (
-                          <strong>{maybe(() => params.ids.length)}</strong>
-                        )
-                      }}
-                    />
+                        values={{
+                          counter: maybe(() => params.ids.length),
+                          displayQuantity: (
+                            <strong>{maybe(() => params.ids.length)}</strong>
+                          )
+                        }}
+                      />
+                    </DialogContentText>
                     <DialogContentText>
                       <FormattedMessage defaultMessage="Remember this will also delete all products assigned to this category." />
                     </DialogContentText>
diff --git a/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx b/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx
index b3d9de48f..545d0c642 100644
--- a/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx
+++ b/src/navigation/components/MenuItemDialog/MenuItemDialog.tsx
@@ -18,6 +18,7 @@ import { SearchCategories_categories_edges_node } from "@saleor/containers/Searc
 import { SearchCollections_collections_edges_node } from "@saleor/containers/SearchCollections/types/SearchCollections";
 import { SearchPages_pages_edges_node } from "@saleor/containers/SearchPages/types/SearchPages";
 import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors";
+import useModalDialogOpen from "@saleor/hooks/useModalDialogOpen";
 import useStateFromProps from "@saleor/hooks/useStateFromProps";
 import { buttonMessages, sectionNames } from "@saleor/intl";
 import { UserError } from "@saleor/types";
@@ -97,17 +98,20 @@ const MenuItemDialog: React.StatelessComponent<MenuItemDialogProps> = ({
   );
   const [url, setUrl] = React.useState<string>(undefined);
 
+  // Reset input state after closing dialog
+  useModalDialogOpen(open, {
+    onClose: () => {
+      setData(initial || defaultInitial);
+      setDisplayValue(initialDisplayValue);
+      setUrl(undefined);
+    }
+  });
+
   // Refresh initial display value if changed
   React.useEffect(() => setDisplayValue(initialDisplayValue), [
     initialDisplayValue
   ]);
 
-  // Reset input state after closing dialog
-  React.useEffect(() => {
-    setDisplayValue(initialDisplayValue);
-    setUrl(undefined);
-  }, [open]);
-
   const mutationErrors = getErrors(errors);
 
   let options: IMenu = [];
diff --git a/src/storybook/stories/attributes/AttributeListPage.tsx b/src/storybook/stories/attributes/AttributeListPage.tsx
index c685a4313..5d575ee01 100644
--- a/src/storybook/stories/attributes/AttributeListPage.tsx
+++ b/src/storybook/stories/attributes/AttributeListPage.tsx
@@ -18,7 +18,8 @@ const props: AttributeListPageProps = {
   ...listActionsProps,
   ...tabPageProps,
   ...searchPageProps,
-  attributes
+  attributes,
+  onBack: () => undefined
 };
 
 storiesOf("Views / Attributes / Attribute list", module)