diff --git a/src/avtk/avtk_clip_selector.h b/src/avtk/avtk_clip_selector.h
index 9d8e897..d242956 100644
--- a/src/avtk/avtk_clip_selector.h
+++ b/src/avtk/avtk_clip_selector.h
@@ -342,7 +342,7 @@ class ClipSelector : public Fl_Button
               else if ( strcmp(m->label(), "Load") == 0 )
               {
                 clipSelectorLoad( ID, clipNum );
-                loadClip( clipNum, "---" );
+                //loadClip( clipNum, "---" );
               }
               else if ( strcmp(m->label(), "1") == 0 ) {
                 EventLooperLoopLength e = EventLooperLoopLength(ID, clipNum ,1);
diff --git a/src/gclipselectoraction.hxx b/src/gclipselectoraction.hxx
index 4c2aba4..282165e 100644
--- a/src/gclipselectoraction.hxx
+++ b/src/gclipselectoraction.hxx
@@ -33,6 +33,10 @@ static string choose_file()
 static void clipSelectorLoad(int track, int scene)
 {
   string filePathName = choose_file();
+  
+  if ( strcmp( filePathName.c_str(), "" ) == 0 )
+    return;
+  
   AudioBuffer* ab = Worker::loadSample( filePathName );
   EventLooperLoad e = EventLooperLoad( track, scene, ab );
   writeToDspRingbuffer( &e );