1 files changed, 3 insertions, 4 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 4d6a6c0..fbf7e45 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -830,10 +830,9 @@ bool Menu::isItemSelectable(unsigned int index) const {
     if (index >= menuitems.size()) return false;
 
     const MenuItem *item = find(index);
-    if (!item)
-        return false;
-
-    return (typeid(*item) != typeid(FbTk::MenuSeparator));
+    return (!item || 
+        (typeid(*item) == typeid(FbTk::MenuSeparator)) || 
+        !item->isEnabled()) ? false : true;
 }