diff --git a/src/main.c b/src/main.c
index 7ef0af8..171a434 100644
--- a/src/main.c
+++ b/src/main.c
@@ -215,6 +215,7 @@ int main (int argc, char **argv)
     gboolean lower_volume = FALSE;
     gboolean mute = FALSE;
     gboolean no_plugins = FALSE;
+    gboolean embedded = FALSE;
     gboolean fullscreen = FALSE;
     gchar    *client_id = NULL;
     
@@ -233,6 +234,7 @@ int main (int argc, char **argv)
 	{ "lower-volume", 'l', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &lower_volume, N_("Lower volume"), NULL },
 	{ "mute", 'm', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &mute, N_("Mute volume"), NULL },
 	{ "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version, N_("Version information"), NULL },
+	{ "embedded", 'E', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &embedded, N_("Use embedded mode"), NULL },
 	{ "fullscreen", 'F', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &fullscreen, N_("Start in fullscreen mode"), NULL },
 	{ "xv", '\0', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_CALLBACK, (GOptionArgFunc) xv_option_given, N_("Enabled/Disable XV support"), NULL},
 	{ "sm-client-id", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &client_id, NULL, NULL },
@@ -315,7 +317,9 @@ int main (int argc, char **argv)
 	player = parole_player_new (client_id);
 	g_free (client_id);
 	
-	if (fullscreen)
+	if (embedded)
+	    parole_player_embedded (player);
+	else if (fullscreen)
 	    parole_player_full_screen (player, TRUE);
 
 	if ( filenames && filenames[0] != NULL )
diff --git a/src/parole-player.c b/src/parole-player.c
index 65d7265..50d5557 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -303,6 +303,7 @@ struct ParolePlayerPrivate
      
     gboolean             exit;
     
+    gboolean		 embedded;
     gboolean		 full_screen;
     
     ParoleState     state;
@@ -1343,6 +1344,16 @@ parole_player_move_fs_window (ParolePlayer *player)
 }
 
 void
+parole_player_embedded (ParolePlayer *player)
+{
+    gtk_widget_hide (player->priv->menu_bar);
+    gtk_widget_hide (player->priv->playlist_nt);
+    gtk_widget_hide (player->priv->show_hide_playlist);
+    
+    player->priv->embedded = TRUE;
+}
+
+void
 parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
 {
     gint npages;
@@ -1855,7 +1866,7 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
     {
 	case GDK_f:
 	case GDK_F:
-	    parole_player_full_screen_menu_item_activate (player);
+            if ( player->priv->embedded != TRUE ) parole_player_full_screen_menu_item_activate (player);
 	    ret_val = TRUE;
 	    break;
 	case GDK_space: