diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java
index 280b1b4..88b25ec 100644
--- a/java/com/tigervnc/vncviewer/CConn.java
+++ b/java/com/tigervnc/vncviewer/CConn.java
@@ -545,6 +545,9 @@
   }
   
   public void setEmbeddedFeatures(boolean s) {
+    menu.restore.setEnabled(s);
+    menu.minimize.setEnabled(s);
+    menu.maximize.setEnabled(s);
     menu.fullScreen.setEnabled(s);
     menu.newConn.setEnabled(s);
     options.fullScreen.setEnabled(s);
diff --git a/java/com/tigervnc/vncviewer/F8Menu.java b/java/com/tigervnc/vncviewer/F8Menu.java
index 5045b77..472f11f 100644
--- a/java/com/tigervnc/vncviewer/F8Menu.java
+++ b/java/com/tigervnc/vncviewer/F8Menu.java
@@ -36,12 +36,15 @@
     setLightWeightPopupEnabled(false);
     cc = cc_;
     restore    = addMenuItem("Restore",KeyEvent.VK_R);
+    restore.setEnabled(!cc.viewer.embed.getValue());
     move       = addMenuItem("Move");
     move.setEnabled(false);
     size       = addMenuItem("Size");
     size.setEnabled(false);
     minimize   = addMenuItem("Minimize", KeyEvent.VK_N);
+    minimize.setEnabled(!cc.viewer.embed.getValue());
     maximize   = addMenuItem("Maximize", KeyEvent.VK_X);
+    maximize.setEnabled(!cc.viewer.embed.getValue());
     addSeparator();
     exit       = addMenuItem("Close Viewer", KeyEvent.VK_C);
     addSeparator();