diff --git a/src/projectM-engine/PresetLoader.cpp b/src/projectM-engine/PresetLoader.cpp
index 1c717fc0c..ffbae7e17 100644
--- a/src/projectM-engine/PresetLoader.cpp
+++ b/src/projectM-engine/PresetLoader.cpp
@@ -165,12 +165,13 @@ unsigned int PresetLoader::addPresetURL(const std::string & url, const std::stri
 }
 
 void PresetLoader::removePreset(unsigned int index)  {
-	std::vector<std::string>::iterator pos = m_entries.begin();
-	asser(pos != m_entries.end());
+//	std::vector<std::string>::iterator pos = m_entries.begin();
+	//assert(pos != m_entries.end());
+	
+//	pos += index;
 
-	pos += index;
-	m_entries.erase(pos);
-	m_presetNames.erase(pos);
+	m_entries.erase(m_entries.begin()+index);
+	m_presetNames.erase(m_presetNames.begin()+index);
 }
 
 const std::string & PresetLoader::getPresetURL ( unsigned int index) const {
diff --git a/src/qprojectM/src/QProjectM_MainWindow.cpp b/src/qprojectM/src/QProjectM_MainWindow.cpp
index b8ee510f8..e52b5e68e 100644
--- a/src/qprojectM/src/QProjectM_MainWindow.cpp
+++ b/src/qprojectM/src/QProjectM_MainWindow.cpp
@@ -125,13 +125,15 @@ void QProjectM_MainWindow::keyReleaseEvent ( QKeyEvent * e )  {
 		return;
 
 	case Qt::Key_F:			
-		//if (ui.presetSearchBarLineEdit->hasFocus())
-		//	return;
+		if (ui.presetSearchBarLineEdit->hasFocus())
+			return;
 		this->setWindowState(this->windowState() ^ Qt::WindowFullScreen);
 		return;
 
 	case Qt::Key_M:
-
+		if (ui.presetSearchBarLineEdit->hasFocus())
+			return;
+		
 		if (ui.presetPlayListDockWidget->isVisible()) {
 			ui.presetPlayListDockWidget->hide();
 		} else
@@ -283,11 +285,9 @@ QString QProjectM_MainWindow::strippedName(const QString &fullFileName)
 }
 
 
-void QProjectM_MainWindow::updateFilteredPlaylist(const QString & text) {
+void QProjectM_MainWindow::updateFilteredPlaylist(const QString & filter) {
 	
 
-	const QString & filter = text;
-
 	if (filter.length() < previousFilter.length()) {
 
 		StringPairVector & stringPairs = *exclusionHash.value(previousFilter);