diff --git a/docs/documentation/running_a_simulation/runtime_guis/images/SimControlPanel.jpg b/docs/documentation/running_a_simulation/runtime_guis/images/SimControlPanel.jpg
index af6d22528..dc1c84335 100644
Binary files a/docs/documentation/running_a_simulation/runtime_guis/images/SimControlPanel.jpg and b/docs/documentation/running_a_simulation/runtime_guis/images/SimControlPanel.jpg differ
diff --git a/trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java b/trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java
index db5421073..b6b0ae9c6 100644
--- a/trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java
+++ b/trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java
@@ -17,6 +17,7 @@
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
+import java.awt.Desktop;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.BufferedReader;
@@ -30,6 +31,7 @@
 import java.net.MulticastSocket;
 import java.net.UnknownHostException;
 import java.net.SocketTimeoutException;
+import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.channels.NotYetConnectedException;
@@ -240,6 +242,18 @@ public void startMTV() {
         launchTrickApplication("mtv",  host + " " + port);
     }
 
+    @Action
+    public void openWiki() {
+        if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
+            try {
+                Desktop.getDesktop().browse(new URI("https://nasa.github.io/trick/index"));
+            }
+            catch(Exception e) {
+                System.out.println("Exception occurred while opening wiki: " + e.getMessage());
+            }
+        }
+    }
+
     @Action
     public void freezeAt() {
         actionController.handleFreezeAt(simState.getExecOutTime(), getMainFrame());
@@ -979,9 +993,11 @@ protected JToolBar createToolBar() {
                 "---",
                 "startMTV",             
                 "---",
-                "throttle"
+                "throttle",             
+                "---",
+                "openWiki"
             };
-        JToolBar toolBar = new JToolBar();      
+        JToolBar toolBar = new JToolBar(); 
         for (String actionName : toolbarActionNames) {
             if (actionName.equals("---")) {
                 toolBar.addSeparator();
diff --git a/trick_source/java/src/main/java/trick/simcontrol/utils/SimControlActionController.java b/trick_source/java/src/main/java/trick/simcontrol/utils/SimControlActionController.java
index 0e2adc7ca..dea9d703d 100644
--- a/trick_source/java/src/main/java/trick/simcontrol/utils/SimControlActionController.java
+++ b/trick_source/java/src/main/java/trick/simcontrol/utils/SimControlActionController.java
@@ -237,7 +237,7 @@ public void actionPerformed(ActionEvent e) {
 			}
 		}
 	}
-	
+
 	/**
 	 * Invoked when the users presses the Step button.
          * @param debug_flag single step the sim
diff --git a/trick_source/java/src/main/resources/trick/simcontrol/resources/SimControlApplication.properties b/trick_source/java/src/main/resources/trick/simcontrol/resources/SimControlApplication.properties
index 87c64763a..a35b7cdf8 100644
--- a/trick_source/java/src/main/resources/trick/simcontrol/resources/SimControlApplication.properties
+++ b/trick_source/java/src/main/resources/trick/simcontrol/resources/SimControlApplication.properties
@@ -24,6 +24,10 @@ startMTV.Action.text = Start &Event/Malfunction Trick View
 startMTV.Action.shortDescription = Start Event/Malfunction Trick View (MTV)
 startMTV.Action.icon = mtv_22x22.png
 
+openWiki.Action.text = Open Trick Wiki
+openWiki.Action.shortDescription = Open Trick Wiki in default browser
+openWiki.Action.icon = question_22x22.png
+
 freezeAt.Action.text = Freeze &At...
 freezeAt.Action.shortDescription = Freeze At
 
diff --git a/trick_source/java/src/main/resources/trick/simcontrol/resources/question_22x22.png b/trick_source/java/src/main/resources/trick/simcontrol/resources/question_22x22.png
new file mode 100644
index 000000000..8b9d980d7
Binary files /dev/null and b/trick_source/java/src/main/resources/trick/simcontrol/resources/question_22x22.png differ