Index: class.t3lib_tsfebeuserauth.php
===================================================================
--- class.t3lib_tsfebeuserauth.php	(revision 100)
+++ class.t3lib_tsfebeuserauth.php	(working copy)
@@ -235,7 +235,7 @@
 	public function isFrontendEditingActive() {
 		return ($this->extAdmEnabled
 			&& ($this->adminPanel->isAdminModuleEnabled('edit') && $this->adminPanel->isAdminModuleOpen('edit')
-			|| $GLOBALS['TSFE']->displayEditIcons == 1)
+			|| $GLOBALS['TSFE']->displayEditIcons == 1 || $GLOBALS['TSFE']->displayFieldEditIcons == 1)
 		);
 	}
 
@@ -307,7 +307,7 @@
 		} else {
 			return false;
 		}
-	 }
+	}
 
 
 	/**