diff --git a/src/objects/toolbar/settings.c b/src/objects/toolbar/settings.c
index 3fcccf4..9316a27 100644
--- a/src/objects/toolbar/settings.c
+++ b/src/objects/toolbar/settings.c
@@ -281,7 +281,7 @@
 		gtk_box_pack_start(
 				GTK_BOX(page->parent.widget),
 				pw3270_frame_new(GTK_WIDGET(grid), _("Options")),
-				TRUE,
+				FALSE,
 				TRUE,
 				0
 			);
diff --git a/ui/application.xml b/ui/application.xml
index f2f82bc..32dd477 100644
--- a/ui/application.xml
+++ b/ui/application.xml
@@ -223,49 +223,41 @@
 				<item>
 					<attribute name="label" translatable="yes">Copy</attribute>
 					<attribute name="action">win.copy</attribute>
-					<attribute name="target">auto</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Copy as text</attribute>
-					<attribute name="action">win.copy</attribute>
-					<attribute name="target">text</attribute>
+					<attribute name="action">win.copy-text</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Copy as table</attribute>
-					<attribute name="action">win.copy</attribute>
-					<attribute name="target">table</attribute>
+					<attribute name="action">win.copy-table</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Append to copy</attribute>
-					<attribute name="action">win.copy</attribute>
-					<attribute name="target">append</attribute>
+					<attribute name="action">win.copy-append</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Cut</attribute>
 					<attribute name="action">win.cut</attribute>
-					<attribute name="target">auto</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Paste from clipboard</attribute>
 					<attribute name="action">win.paste</attribute>
-					<attribute name="target">clipboard://</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Paste next</attribute>
-					<attribute name="action">win.paste</attribute>
-					<attribute name="target">next://</attribute>
+					<attribute name="action">win.paste-next</attribute>
 				</item>
 
 				<item>
 					<attribute name="label" translatable="yes">Paste from text file</attribute>
-					<attribute name="action">win.paste</attribute>
-					<attribute name="target">file://</attribute>
+					<attribute name="action">win.paste-file</attribute>
 				</item>
 
 			</section>
--
libgit2 0.21.2