diff --git a/src/drivers/Qt/TasEditor/greenzone.cpp b/src/drivers/Qt/TasEditor/greenzone.cpp
index 5360e5be..821e6e45 100644
--- a/src/drivers/Qt/TasEditor/greenzone.cpp
+++ b/src/drivers/Qt/TasEditor/greenzone.cpp
@@ -198,7 +198,8 @@ bool GREENZONE::clearSavestateOfFrame(unsigned int frame)
 	{
 	    savestates[frame].resize(0);
 		return true;
-	} else
+	}
+	else
 	{
 		return false;
 	}
@@ -207,9 +208,12 @@ bool GREENZONE::clearSavestateAndFreeMemory(unsigned int frame)
 {
 	if (frame < savestates.size() && savestates[frame].size())
 	{
-		//savestates[frame].swap(std::vector<uint8_t>()); FIXME
+		//savestates[frame].swap(std::vector<uint8_t>()); //FIXME
+		savestates[frame].clear();
+		savestates[frame].shrink_to_fit();
 		return true;
-	} else
+	}
+	else
 	{
 		return false;
 	}
diff --git a/src/drivers/Qt/TasEditor/selection.cpp b/src/drivers/Qt/TasEditor/selection.cpp
index 6454a920..c346cf17 100644
--- a/src/drivers/Qt/TasEditor/selection.cpp
+++ b/src/drivers/Qt/TasEditor/selection.cpp
@@ -263,7 +263,7 @@ void SELECTION::jumpToFrame(int frame)
 {
 	clearAllRowsSelection();
 	setRowSelection(frame);
-	//pianoRoll.followSelection(); FIXME
+	tasWin->pianoRoll->followSelection();
 }
 // ----------------------------------------------------------
 void SELECTION::save(EMUFILE *os, bool really_save)