Index: modfunc_file_list/class.tx_dam_file_list.php
===================================================================
--- modfunc_file_list/class.tx_dam_file_list.php	(revision 28174)
+++ modfunc_file_list/class.tx_dam_file_list.php	(working copy)
@@ -393,10 +393,13 @@
 			$actionCall->initActions();
 			$actions = $actionCall->renderActionsHorizontal();
 			$this->pObj->markers['FOLDER'] = $actions[0];
-			if ($GLOBALS['BE_USER']->uc['enableFlashUploader']) {
-				$this->pObj->markers['UPLOAD'] = '<a href="#" id="button-upload"><img' . t3lib_iconWorks::skinImg($this->pObj->doc->backPath, 'gfx/upload.gif') . ' title="'.$GLOBALS['LANG']->sL('LLL:EXT:dam/modfunc_file_upload/locallang.xml:tx_dam_file_upload.title',1).'" alt="" height="16" width="16"></a>';
-			} else {
-				$this->pObj->markers['UPLOAD'] = '<a href="#" onclick="jumpToUrl(\'index.php?&amp;id=1&amp;SET[function]=tx_dam_file_upload\',this); return false;"><img' . t3lib_iconWorks::skinImg($this->pObj->doc->backPath, 'gfx/upload.gif') . ' title="'.$GLOBALS['LANG']->sL('LLL:EXT:dam/modfunc_file_upload/locallang.xml:tx_dam_file_upload.title',1).'" alt="" height="16" width="16"></a>';
+			
+			if (array_key_exists('tx_dam_file_upload', $this->pObj->MOD_MENU['function'])) {
+				if ($GLOBALS['BE_USER']->uc['enableFlashUploader']) {
+					$this->pObj->markers['UPLOAD'] = '<a href="#" id="button-upload"><img' . t3lib_iconWorks::skinImg($this->pObj->doc->backPath, 'gfx/upload.gif') . ' title="'.$GLOBALS['LANG']->sL('LLL:EXT:dam/modfunc_file_upload/locallang.xml:tx_dam_file_upload.title',1).'" alt="" height="16" width="16"></a>';
+				} else {
+					$this->pObj->markers['UPLOAD'] = '<a href="#" onclick="jumpToUrl(\'index.php?&amp;id=1&amp;SET[function]=tx_dam_file_upload\',this); return false;"><img' . t3lib_iconWorks::skinImg($this->pObj->doc->backPath, 'gfx/upload.gif') . ' title="'.$GLOBALS['LANG']->sL('LLL:EXT:dam/modfunc_file_upload/locallang.xml:tx_dam_file_upload.title',1).'" alt="" height="16" width="16"></a>';
+				}
 			}
 			$this->pObj->markers['NEW'] = $actions[1];
 		}