diff --git a/src/Zenith/CLI.hs b/src/Zenith/CLI.hs
index 016c962..f2f23bd 100644
--- a/src/Zenith/CLI.hs
+++ b/src/Zenith/CLI.hs
@@ -195,7 +195,6 @@ data State = State
   , _abAddresses :: !(L.List Name (Entity AddressBook))
   , _abForm :: !(Form AdrBookEntry () Name)
   , _abCurAdrs :: !T.Text     -- used for address book CRUD operations
-  , _abTxt :: !T.Text         -- Holds the Address Book entry data to show 
   }
 
 makeLenses ''State
@@ -549,14 +548,21 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
                (strWrapWith
                   (WrapSettings False True NoFill FillAfterFirst)
                   (st ^. msg)))
-        AdrBookEntryDisplay ->
-          withBorderStyle unicodeBold $
-          D.renderDialog
-            (D.dialog (Just $ txt " Address Book Entry ") Nothing 60)
-            (padAll 1 $ 
-             txtWrapWith (WrapSettings False True NoFill FillAfterFirst) $
-             (st ^. abTxt))
-            
+        AdrBookEntryDisplay -> do 
+         case L.listSelectedElement $ st ^. abAddresses of
+            Just (_, a) -> do
+              let abentry = T.pack $
+                         " Descr: " ++
+                         T.unpack (addressBookAbdescrip (entityVal a)) ++ 
+                         "\n Address: " ++
+                         T.unpack (addressBookAbaddress (entityVal a)) 
+              withBorderStyle unicodeBold $
+                D.renderDialog
+                (D.dialog (Just $ txt " Address Book Entry ") Nothing 60)
+                (padAll 1 $ 
+                txtWrapWith (WrapSettings False True NoFill FillAfterFirst) $ 
+                abentry)
+            _ -> emptyWidget
         BlankDisplay -> emptyWidget
 
 mkInputForm :: DialogInput -> Form DialogInput e Name
@@ -1099,16 +1105,11 @@ appEvent (BT.VtyEvent e) = do
                           BT.modify $ set dialogBox AdrBookForm
                        -- Show AddressBook entry data  
                        V.EvKey V.KEnter [] -> do 
-                         case L.listSelectedElement $ s ^. abAddresses of
-                            Just (_, a) -> do
-                              BT.modify $ set abTxt $ T.pack $
-                                 " Descr: " ++
-                                 T.unpack (addressBookAbdescrip (entityVal a)) ++ 
-                                 "\n Address: " ++
-                                 T.unpack (addressBookAbaddress (entityVal a)) 
+--                         case L.listSelectedElement $ s ^. abAddresses of
+--                            Just (_, a) -> do
                               BT.modify $ set displayBox AdrBookEntryDisplay
-                            _ -> do 
-                                BT.modify $ set dialogBox Blank    
+--                            _ -> do 
+--q                                BT.modify $ set dialogBox Blank    
                        -- Process any other event       
                        ev -> BT.zoom abAddresses $ L.handleListEvent ev
                    -- Process new address book entry
@@ -1336,7 +1337,6 @@ runZenithCLI config = do
               (mkSendForm 0 $ SendInput "" 0.0 "")
               (L.list ABList (Vec.fromList abookList) 1)
               (mkNewABForm (AdrBookEntry "" ""))
-              " "
               ""
     Left e -> print $
       "No Zebra node available on port " <>