diff --git a/app/components/Dashboard/AddBook.jsx b/app/components/Dashboard/AddBook.jsx
index 645010732f3278751a605714651d84c0b782cbe2..bd6a4ff608f5b4c49f12a8f27f688467576d14e8 100644
--- a/app/components/Dashboard/AddBook.jsx
+++ b/app/components/Dashboard/AddBook.jsx
@@ -20,20 +20,18 @@ export default class AddBook extends React.Component {
 
   handleKeyOnInput (event) {
     if (event.charCode !== 13) return
-
-    const { toggle } = this.props
     this.onCreate()
-    toggle()
   }
 
   onCreate () {
-    const { create } = this.props
+    const { create, toggle } = this.props
 
     const input = this.inputRef
     const newTitle = input.value.trim()
 
     if (newTitle.length === 0) return this.setState({ error: true })
     create(newTitle)
+    toggle()
   }
 
   onInputChange () {
@@ -64,7 +62,7 @@ export default class AddBook extends React.Component {
     const { error } = this.state
 
     const el = (
-      <div>
+      <div className='error' >
         New book title cannot be empty
       </div>
     )
diff --git a/app/components/common/AbstractModal.jsx b/app/components/common/AbstractModal.jsx
index ad15dd0d3a9dec442d23d129030fe02f312dce21..795018b820f4e42ec461e836ac45957a2739ed30 100644
--- a/app/components/common/AbstractModal.jsx
+++ b/app/components/common/AbstractModal.jsx
@@ -8,10 +8,8 @@ export class BookBuilderModal extends React.Component {
   }
 
   performAction () {
-    const { successAction, toggle } = this.props
-
+    const { successAction } = this.props
     successAction()
-    toggle()
   }
 
   renderHeader () {