diff --git a/src/TestCentric/testcentric.gui/Presenters/TestCentricPresenter.cs b/src/TestCentric/testcentric.gui/Presenters/TestCentricPresenter.cs
index bdd914ef..45989bf5 100644
--- a/src/TestCentric/testcentric.gui/Presenters/TestCentricPresenter.cs
+++ b/src/TestCentric/testcentric.gui/Presenters/TestCentricPresenter.cs
@@ -954,7 +954,8 @@ private void RunAllTests()
         private void RunSelectedTests()
         {
             var testSelection = _model.SelectedTests;
-            _model.RunTests(testSelection);
+            if (testSelection != null)
+                _model.RunTests(testSelection);
         }
 
         private void RunFailedTests()
diff --git a/src/TestCentric/tests/Presenters/Main/CommandTests.cs b/src/TestCentric/tests/Presenters/Main/CommandTests.cs
index 1a9120ec..cc9272cb 100644
--- a/src/TestCentric/tests/Presenters/Main/CommandTests.cs
+++ b/src/TestCentric/tests/Presenters/Main/CommandTests.cs
@@ -250,9 +250,17 @@ public void RunAllButton_RunsAllTests()
         [Test]
         public void RunButton_RunsSelectedTests()
         {
-            // TODO: Specify Results and test with specific argument
+            var testSelection = new TestSelection();
+            _model.SelectedTests = testSelection;
             _view.RunSelectedButton.Execute += Raise.Event<CommandHandler>();
-            _model.Received().RunTests(Arg.Any<TestSelection>());
+            _model.Received().RunTests(testSelection);
+        }
+
+        [Test]
+        public void RunButton_NoTestSelected_DidnotRunTests()
+        {
+            _view.RunSelectedButton.Execute += Raise.Event<CommandHandler>();
+            _model.DidNotReceiveWithAnyArgs().RunTests(Arg.Any<TestSelection>());
         }
 
         [Test]