diff --git a/public/components/custom_panels/custom_panel_table.tsx b/public/components/custom_panels/custom_panel_table.tsx
index 76dd46d9e..8c4a3a2a5 100644
--- a/public/components/custom_panels/custom_panel_table.tsx
+++ b/public/components/custom_panels/custom_panel_table.tsx
@@ -122,7 +122,8 @@ export const CustomPanelTable = ({
 
   const onCreate = async (newCustomPanelName: string) => {
     if (!isNameValid(newCustomPanelName)) {
-      setToast('Invalid Dashboard name', 'danger');
+      setToast('Invalid Dashboard Name', 'danger');
+      history.goBack();
     } else {
       const newPanel = newPanelTemplate(newCustomPanelName);
       dispatch(createPanel(newPanel));
@@ -132,7 +133,7 @@ export const CustomPanelTable = ({
 
   const onRename = async (newCustomPanelName: string) => {
     if (!isNameValid(newCustomPanelName)) {
-      setToast('Invalid Dashboard name', 'danger');
+      setToast('Invalid Dashboard Name', 'danger');
     } else {
       dispatch(renameCustomPanel(newCustomPanelName, selectedCustomPanels[0].id));
     }
@@ -141,7 +142,7 @@ export const CustomPanelTable = ({
 
   const onClone = async (newName: string) => {
     if (!isNameValid(newName)) {
-      setToast('Invalid Operational Panel name', 'danger');
+      setToast('Invalid Operational Panel Name', 'danger');
     } else {
       let sourcePanel = selectedCustomPanels[0];
       try {