diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp
index faac00a75c3..bc4acefcd65 100644
--- a/src/gui/FileBrowser.cpp
+++ b/src/gui/FileBrowser.cpp
@@ -380,11 +380,11 @@ void FileBrowserTreeWidget::keyPressEvent(QKeyEvent * ke )
 			}
 		case Qt::Key_Right:
 		{
-			if (!ke->isAutoRepeat()){
+			if (!ke->isAutoRepeat() && file != NULL){
 				if (!ke->modifiers())
-					{ tryAddSEInstrumentTrack(file); }
+					{ openInNewInstrumentTrackSE(file); }
 				else if (ke->modifiers() & Qt::ControlModifier)
-					{ tryAddBBInstrumentTrack(file); }
+					{ openInNewInstrumentTrackBBE(file); }
 			}
 			break;
 		}
@@ -406,8 +406,7 @@ void FileBrowserTreeWidget::keyPressEvent(QKeyEvent * ke )
 void FileBrowserTreeWidget::contextMenuEvent(QContextMenuEvent * e )
 {
 	FileItem * file = dynamic_cast<FileItem *>( itemAt( e->pos() ) );
-	if( file != NULL && (file->handling() == FileItem::LoadByPlugin ||
-	                    file->handling() == FileItem::LoadAsPreset) )
+	if( file != NULL && file->isTrack() )
 	{
 		QMenu contextMenu( this );
 
@@ -554,9 +553,7 @@ void FileBrowserTreeWidget::previewFileItem(FileItem* file)
 		m_previewPlayHandle = new PresetPreviewPlayHandle(
 			file->fullName(), file->handling() == FileItem::LoadByPlugin );
 	}
-	else if( file->type() != FileItem::VstPluginFile &&
-			( file->handling() == FileItem::LoadAsPreset ||
-			file->handling() == FileItem::LoadByPlugin ) )
+	else if( file->type() != FileItem::VstPluginFile && file->isTrack() )
 	{
 		DataFile dataFile( file->fullName() );
 		if( !dataFile.validate( file->extension() ) )
@@ -752,8 +749,7 @@ void FileBrowserTreeWidget::activateListItem(QTreeWidgetItem * item,
 
 void FileBrowserTreeWidget::openInNewInstrumentTrack( TrackContainer* tc, FileItem* item )
 {
-	if( item->handling() == FileItem::LoadAsPreset ||
-		item->handling() == FileItem::LoadByPlugin )
+	if( item->isTrack() )
 	{
 		InstrumentTrack * it = dynamic_cast<InstrumentTrack *>(
 				Track::create( Track::InstrumentTrack, tc ) );
@@ -780,22 +776,6 @@ void FileBrowserTreeWidget::openInNewInstrumentTrackSE( FileItem* item )
 
 
 
-void FileBrowserTreeWidget::tryAddSEInstrumentTrack(FileItem* file)
-{
-	if (file != NULL && file->isTrack()){ openInNewInstrumentTrackSE(file); }
-}
-
-
-
-
-void FileBrowserTreeWidget::tryAddBBInstrumentTrack(FileItem* file)
-{
-	if (file != NULL && file->isTrack()){ openInNewInstrumentTrackBBE(file); }
-}
-
-
-
-
 void FileBrowserTreeWidget::openInNewSampleTrack( FileItem* item )
 {